From 1ca0f169fb231ca7505cbf68502f7ba015dc2442 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 28 Aug 2025 23:44:50 -0500 Subject: [PATCH] more things --- flake.lock | 100 +++++++----------- flake.nix | 33 +++--- .../users/nathan/packages/default.nix | 25 +++-- .../users/nathan/packages/scripts/default.nix | 24 +++-- .../nathan}/default.nix | 0 .../nathan}/secrets.yaml | 0 system-config/configuration/iso/default.nix | 93 ++++++++++++++++ system-config/configuration/live/wip.nix | 75 ------------- 8 files changed, 175 insertions(+), 175 deletions(-) rename system-config/configuration/{sandbox-nathan => containers/nathan}/default.nix (100%) rename system-config/configuration/{sandbox-nathan => containers/nathan}/secrets.yaml (100%) create mode 100644 system-config/configuration/iso/default.nix delete mode 100644 system-config/configuration/live/wip.nix diff --git a/flake.lock b/flake.lock index 2e63c66..9ca352e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755632680, - "narHash": "sha256-EjaD8+d7AiAV2fGRN4NTMboWDwk8szDfwbzZ8DL1PhQ=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "50637ed23e962f0db294d6b0ef534f37b144644b", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1756181002, - "narHash": "sha256-bPChgpfVqZQxkX0sqFVypO4CFu+swVqqgWySHWK+1wc=", + "lastModified": 1756353808, + "narHash": "sha256-JkCqOE0kjWbT7GnXgngL+baLF/OeeVfPCh71HXfRh6g=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3cb5445c6a575cf7ece61678449bee89eec864d7", + "rev": "e47914363ccacc95994b567966d7fa1e25dd85ec", "type": "gitlab" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -226,27 +226,6 @@ "type": "github" } }, - "home-manager-us": { - "inputs": { - "nixpkgs": [ - "nixpkgs-us" - ] - }, - "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -292,11 +271,11 @@ ] }, "locked": { - "lastModified": 1754305013, - "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", + "lastModified": 1755678602, + "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", + "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", "type": "github" }, "original": { @@ -321,11 +300,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1756069181, - "narHash": "sha256-FPur4yuDwzM9uHhPFJW6KD3Xys5fz0xmRmZqFfWQD3Y=", + "lastModified": 1756372920, + "narHash": "sha256-dPvJtc+YqUZ0CQao0DtOH5eF33YWPnpu2SP+ce5H7zU=", "ref": "refs/heads/main", - "rev": "0ed880f3f7dc2c746bf3590eee266c010d737558", - "revCount": 6393, + "rev": "4b2bfbd85f1ea77a165d9ba92d62016cdf3abfcd", + "revCount": 6398, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -470,11 +449,11 @@ ] }, "locked": { - "lastModified": 1755416120, - "narHash": "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e631ea36ddba721eceda69bfee6dd01068416489", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -571,11 +550,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756001439, - "narHash": "sha256-IdIgQP6nfHgzn+pRSzm+mHiU0mwbQvOmusv+LrpSBrk=", + "lastModified": 1756406526, + "narHash": "sha256-N2bpIuvXq1vjFU9+CeHu3JMmWYrD9m6mtjx/iWZpxio=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "3a015545c12704bdeca89f3e77cacc68acd3ddb1", + "rev": "b0e55f47b8729227eccc8bdb8de2459ac14f69ed", "type": "github" }, "original": { @@ -613,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -676,11 +655,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -708,11 +687,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -761,17 +740,17 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1755754251, + "lastModified": 1756234794, "narHash": "sha256-objBSkdkrn6BpQ1mH1tkvXmipfJ+mONHuydefPhdNSs=", "ref": "refs/heads/master", - "rev": "3ba1175ea9cdff79caf368460919af740480fe26", - "revCount": 33, + "rev": "50ffcb48e2bc7e18fd7123c876158b913300b177", + "revCount": 35, "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai" + "url": "https://gitea.blunkall.us/Blunkall-Technologies/Moirai" }, "original": { "type": "git", - "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai" + "url": "https://gitea.blunkall.us/Blunkall-Technologies/Moirai" } }, "nixvim_2": { @@ -867,11 +846,11 @@ ] }, "locked": { - "lastModified": 1755446520, - "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { @@ -885,7 +864,6 @@ "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "home-manager-us": "home-manager-us", "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", "nix-on-droid": "nix-on-droid", diff --git a/flake.nix b/flake.nix index 0a63fce..7907215 100644 --- a/flake.nix +++ b/flake.nix @@ -3,23 +3,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - #nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11"; nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable"; - #nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; - #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager-us = { - url = "github:nix-community/home-manager/master"; - #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11"; - inputs.nixpkgs.follows = "nixpkgs-us"; - }; - nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,10 +38,8 @@ #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - #hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1"; - nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"; - #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai"; + nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai"; }; @@ -101,7 +90,7 @@ system = "aarch64-linux"; specialArgs = { inputs = inputs // { - nathan-home-manager = import ./home-manager/users/nathan; + nathan = import ./home-manager/users/nathan; }; }; modules = [ @@ -113,7 +102,7 @@ live = nixpkgs.lib.nixosSystem { specialArgs = { inputs = inputs // { - nathan-home-manager = import ./home-manager/users/nathan; + nathan = import ./home-manager/users/nathan; }; }; modules = [ @@ -125,11 +114,23 @@ container = nixpkgs.lib.nixosSystem { specialArgs = { inputs = inputs // { - nathan-home-manager = import ./home-manager/users/nathan; + nathan = import ./home-manager/users/nathan; }; }; modules = [ - ./system-config/configuration/sandbox-nathan + ./system-config/configuration/containers/nathan + ./system-config + ]; + }; + + iso = nixpkgs.lib.nixosSystem { + specialArgs = { + inputs = inputs // { + nathan = import ./home-manager/users/nathan; + }; + }; + modules = [ + ./system-config/configuration/iso ./system-config ]; }; diff --git a/home-manager/users/nathan/packages/default.nix b/home-manager/users/nathan/packages/default.nix index 41ae858..3938444 100644 --- a/home-manager/users/nathan/packages/default.nix +++ b/home-manager/users/nathan/packages/default.nix @@ -23,6 +23,7 @@ }; home.packages = with pkgs; ([ + kjv openssh sops killall @@ -32,6 +33,17 @@ rsync curl wget + (python313.withPackages (ps: with ps; [ + gpustat + numpy + matplotlib + scipy + pandas + pyaudio + pyusb + debugpy + requests + ])) ] ++ (if config.homeconfig.graphical then [ grim slurp @@ -45,19 +57,6 @@ neovim-remote gcc zulu - - (python313.withPackages (ps: with ps; [ - gpustat - numpy - matplotlib - scipy - pandas - pyaudio - pyusb - debugpy - requests - ])) - fastfetch ncmpcpp playerctl diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix index 9250b97..0c17077 100644 --- a/home-manager/users/nathan/packages/scripts/default.nix +++ b/home-manager/users/nathan/packages/scripts/default.nix @@ -12,7 +12,7 @@ #scripts (pkgs.writeShellScriptBin "_systemRebuild" '' - ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/Olympus + ${pkgs.nh}/bin/nh os switch --ask echo //////Enter to close////// read '') @@ -48,29 +48,33 @@ $alpha=100 fi - wal -i $img -a $alpha --cols16 -n + ${pkgs.pywal16}/bin/wal -i $img -a $alpha --cols16 -n echo $alpha > ~/.config/bga sleep 0.4 - pywalfox update & + ${pkgs.pywalfox}/bin/pywalfox update & [[ $(pidof cava) != "" ]] && pkill -USR1 cava & - for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send 'colorscheme pywal'; done + for i in $(ls /run/user/1000 | grep nvim); do ${pkgs.neovim-remote}/bin/nvr -s --servername /run/user/1000/$i --remote-send 'colorscheme pywal'; done pkill -USR1 kitty '') + (pkgs.writeShellScriptBin "onSystemStart" '' - ${pkgs.hyprpanel}/bin/hyprpanel & - randWallpaper & - pypr & - lxqt-policykit-agent & - hyprctl setcursor Bibata-Modern-Classic 16 & + hyprctl dispatch exec ${pkgs.hyprpanel}/bin/hyprpanel + if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then + hyprctl dispatch exec "randWallpaper && chmod 600 ${config.home.homeDirectory}/.config/background" + fi + hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr + hyprctl dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui + hyprctl dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent + hyprctl setcursor Bibata-Modern-Classic 16 sleep 3 - hyprctl reload & + hyprctl reload #tmux new-session -s hyprland '') diff --git a/system-config/configuration/sandbox-nathan/default.nix b/system-config/configuration/containers/nathan/default.nix similarity index 100% rename from system-config/configuration/sandbox-nathan/default.nix rename to system-config/configuration/containers/nathan/default.nix diff --git a/system-config/configuration/sandbox-nathan/secrets.yaml b/system-config/configuration/containers/nathan/secrets.yaml similarity index 100% rename from system-config/configuration/sandbox-nathan/secrets.yaml rename to system-config/configuration/containers/nathan/secrets.yaml diff --git a/system-config/configuration/iso/default.nix b/system-config/configuration/iso/default.nix new file mode 100644 index 0000000..ebfbfdf --- /dev/null +++ b/system-config/configuration/iso/default.nix @@ -0,0 +1,93 @@ +{ config, pkgs, inputs, modulesPath, ... }: { + + imports = with inputs; [ + + disko.nixosModules.default + + (import ./disko.nix { device = "/dev/mmcblk0"; }) + + (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") + + sops-nix.nixosModules.sops + + home-manager.nixosModules.default + + ]; + + config = { + + nixpkgs.hostPlatform = "x86_64-linux"; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + }; + + sysconfig = { + remoteBuildClient = true; + host = "live"; + graphical = true; + users = { + nathan = { + extraGroups = [ "wheel" "networkmanager" ]; + hashedPasswordFile = config.sops.secrets."nathan/pass".path; + shell = pkgs.zsh; + home-manager = { + enable = true; + standalone = false; + extraModules = [ + { + homeconfig = { + minimal = false; + hyprland.enable = true; + hyprlock.enable = true; + wal.enable = true; + mpd.enable = true; + hyprpanel.enable = true; + calcurse.enable = true; + rofi.enable = true; + firefox.enable = true; + git.enable = true; + nh.enable = true; + }; + } + ]; + }; + }; + }; + + services = { + sddm.enable = true; + #openssh.enable = false; + pipewire.enable = true; + #kdePlasma6.enable = true; + netbird.enable = true; + #ollama.enable = true; + }; + + programs = { + #steam.enable = true; + hyprpanel.enable = true; + hyprland.enable = true; + }; + + + virtualization = { + + wyoming = { + enable = false; + }; + + homeassistant = { + enable = false; + }; + }; + }; + + system.stateVersion = "25.05"; + + fonts.packages = with pkgs; [ nerd-fonts.fira-code ]; + }; +} diff --git a/system-config/configuration/live/wip.nix b/system-config/configuration/live/wip.nix deleted file mode 100644 index 73a0068..0000000 --- a/system-config/configuration/live/wip.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, lib, pkgs, inputs, modulesPath, ... }: { - - imports = with inputs; [ - - disko.nixosModules.default - - (import ./disko.nix { device = "/dev/sda"; }) - - (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - - sops-nix.nixosModules.sops - - home-manager.nixosModules.default - - system.nixosModule - ]; - - config = { - - nixpkgs.hostPlatform = "x86_64-linux"; - - sysconfig.opts = { - sddm.enable = true; - openssh.enable = false; - pipewire.enable = true; - ags.enable = true; - hyprland.enable = true; - git.enable = true; - nh.enable = true; - }; - - users.users."nathan" = { - isNormalUser = true; - initialPassword = "7567"; - extraGroups = [ "wheel" ]; - }; - - home-manager = { - backupFileExtension = "backup"; - extraSpecialArgs = { inherit inputs; }; - users = { - "nathan" = lib.mkMerge [ - inputs.nathan.homeManagerModule - { - config.homeconfig = { - impermanence.enable = false; - hyprland.enable = true; - swaylock.enable = true; - wal.enable = true; - wayvnc.enable = false; - mpd.enable = true; - ags.enable = true; - calcurse.enable = true; - rofi.enable = true; - firefox.enable = true; - }; - } - ]; - }; - }; - - system.stateVersion = "24.11"; - - nix = { - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - settings = { - experimental-features = [ "nix-command" "flakes" ]; - }; - }; - - networking.hostName = "live"; - - fonts.packages = with pkgs; [ fira-code-nerdfont ]; - }; -}