From 77b7c16edcaf150a16b6d36392a4de15f6049a0f Mon Sep 17 00:00:00 2001 From: blaknull Date: Thu, 24 Oct 2024 15:34:23 -0500 Subject: [PATCH] hopefully the last complete restructure of this repo --- README.md | 8 - flake.lock | 655 +++++++++++------- flake.nix | 189 +---- home-manager/default.nix | 8 + .../dotfiles/Wallpaper/bluescape.jpg | Bin .../dotfiles/Wallpaper/galaxy.jpg | Bin .../dotfiles/Wallpaper/kurisu.gif | Bin .../dotfiles/Wallpaper/kurisu.jpg | Bin .../dotfiles/Wallpaper/llenn.png | Bin .../dotfiles/Wallpaper/megumin.png | Bin .../dotfiles/Wallpaper/megumin1.gif | Bin .../dotfiles/Wallpaper/megumin2.gif | Bin .../dotfiles/Wallpaper/ngnl.jpg | Bin .../dotfiles/Wallpaper/orangescape.jpg | Bin .../dotfiles/Wallpaper/rezero.gif | Bin .../dotfiles/Wallpaper/sao.gif | Bin .../dotfiles/Wallpaper/sao.png | Bin .../dotfiles/Wallpaper/sinon.gif | Bin {home => home-manager}/dotfiles/ags/README.md | 0 .../dotfiles/ags/bluetooth.js | 0 .../dotfiles/ags/brightness.js | 0 {home => home-manager}/dotfiles/ags/clock.js | 0 {home => home-manager}/dotfiles/ags/config.js | 0 {home => home-manager}/dotfiles/ags/media.js | 0 {home => home-manager}/dotfiles/ags/notif.js | 0 .../dotfiles/ags/notification.js | 0 {home => home-manager}/dotfiles/ags/power.js | 0 .../dotfiles/ags/settings.js | 0 {home => home-manager}/dotfiles/ags/style.css | 0 .../dotfiles/ags/systemtray.js | 0 {home => home-manager}/dotfiles/ags/wifi.js | 0 .../dotfiles/ags/workspaces.js | 0 home-manager/dotfiles/default.nix | 26 + .../dotfiles/hypr/main.conf | 0 {home => home-manager}/dotfiles/hypr/otf.conf | 0 .../dotfiles/hypr/pyprland.toml | 0 .../dotfiles/swaylock/config | 0 .../dotfiles/wal/templates/cava_config | 0 .../dotfiles/wal/templates/colors-ags.css | 0 .../dotfiles/wal/templates/colors-discord.css | 0 .../dotfiles/wal/templates/colors-hypr.conf | 0 home-manager/dotfiles/wayvnc/config | 6 + home-manager/dotfiles/wayvnc/rsa_key.pem | 39 ++ home-manager/dotfiles/wayvnc/rsa_key.pem.pub | 1 + {home => home-manager}/flake.nix | 28 +- home-manager/impermanence/default.nix | 21 + {home => home-manager}/packages/default.nix | 0 .../packages/external/default.nix | 0 .../packages/external/flake.nix | 0 {home => home-manager}/packages/flake.nix | 0 .../packages/scripts/default.nix | 3 +- .../packages/scripts/flake.nix | 0 {home => home-manager}/programs/ags/flake.nix | 0 .../programs/calcurse/default.nix | 0 {home => home-manager}/programs/flake.nix | 6 +- .../programs/hyprland/flake.nix | 2 +- .../programs/pywal/flake.nix | 1 + .../programs/rofi/default.nix | 0 .../programs/rofi/flake.nix | 0 .../programs/swaylock/default.nix | 0 .../programs/terminal/bat/default.nix | 0 home-manager/programs/terminal/default.nix | 12 + .../programs/terminal/eza/default.nix | 0 .../programs/terminal/fzf/default.nix | 0 .../programs/terminal/kitty/default.nix | 0 .../programs/terminal/tmux/default.nix | 0 .../programs/terminal/zoxide/default.nix | 0 .../programs/terminal/zsh/default.nix | 0 .../programs/wayvnc/default.nix | 9 - .../services/custom/default.nix | 0 {home => home-manager}/services/default.nix | 0 .../services/mpd/default.nix | 0 home/dotfiles/default.nix | 71 -- home/impermanence/default.nix | 28 - home/impermanence/flake.nix | 10 - home/programs/terminal/bat/flake.nix | 11 - home/programs/terminal/eza/flake.nix | 11 - home/programs/terminal/flake.nix | 29 - home/programs/terminal/fzf/flake.nix | 11 - home/programs/terminal/kitty/flake.nix | 13 - home/programs/terminal/tmux/flake.nix | 11 - home/programs/terminal/zoxide/flake.nix | 11 - home/programs/terminal/zsh/flake.nix | 11 - .../configuration/homebox/default.nix | 191 +++++ system-config/configuration/homebox/disko.nix | 114 +++ .../homebox/hardware-configuration.nix | 4 +- .../configuration/laptop/default.nix | 0 .../laptop/hardware-configuration.nix | 0 .../configuration/live/flake.nix | 0 {system => system-config}/etc/default.nix | 0 system-config/flake.nix | 38 + system-config/packages/default.nix | 1 + .../programs/ags/default.nix | 18 +- {system => system-config}/programs/flake.nix | 4 +- .../programs/git/default.nix | 0 .../programs/hyprland/flake.nix | 6 +- .../programs/nh/default.nix | 0 .../programs/steam/default.nix | 0 system-config/services/default.nix | 8 + .../services/ollama/default.nix | 0 .../services/openssh/default.nix | 0 .../services/pipewire/default.nix | 0 system-config/services/sddm/flake.lock | 42 ++ .../services/sddm/flake.nix | 0 .../services/sddm/themes/sugar-dark/flake.nix | 0 .../sddm/themes/tokyo-night/flake.lock | 27 + .../sddm/themes/tokyo-night/flake.nix | 0 system/configuration/default.nix | 76 -- system/configuration/homebox/default.nix | 86 --- system/disko/default.nix | 28 - system/disko/disko.nix | 79 --- system/disko/disko_bonus.nix | 48 -- system/disko/flake.nix | 19 - system/disko/impermanent.nix | 30 - system/first_boot/default.nix | 37 - system/flake.nix | 73 -- system/hardware-configuration.nix | 39 -- system/impermanence/default.nix | 27 - system/impermanence/flake.nix | 10 - system/packages/external/flake.nix | 21 - system/packages/flake.nix | 17 - system/packages/scripts/flake.nix | 12 - system/services/flake.nix | 21 - 123 files changed, 994 insertions(+), 1313 deletions(-) delete mode 100644 README.md create mode 100644 home-manager/default.nix rename {home => home-manager}/dotfiles/Wallpaper/bluescape.jpg (100%) rename {home => home-manager}/dotfiles/Wallpaper/galaxy.jpg (100%) rename {home => home-manager}/dotfiles/Wallpaper/kurisu.gif (100%) rename {home => home-manager}/dotfiles/Wallpaper/kurisu.jpg (100%) rename {home => home-manager}/dotfiles/Wallpaper/llenn.png (100%) rename {home => home-manager}/dotfiles/Wallpaper/megumin.png (100%) rename {home => home-manager}/dotfiles/Wallpaper/megumin1.gif (100%) rename {home => home-manager}/dotfiles/Wallpaper/megumin2.gif (100%) rename {home => home-manager}/dotfiles/Wallpaper/ngnl.jpg (100%) rename {home => home-manager}/dotfiles/Wallpaper/orangescape.jpg (100%) rename {home => home-manager}/dotfiles/Wallpaper/rezero.gif (100%) rename {home => home-manager}/dotfiles/Wallpaper/sao.gif (100%) rename {home => home-manager}/dotfiles/Wallpaper/sao.png (100%) rename {home => home-manager}/dotfiles/Wallpaper/sinon.gif (100%) rename {home => home-manager}/dotfiles/ags/README.md (100%) rename {home => home-manager}/dotfiles/ags/bluetooth.js (100%) rename {home => home-manager}/dotfiles/ags/brightness.js (100%) rename {home => home-manager}/dotfiles/ags/clock.js (100%) rename {home => home-manager}/dotfiles/ags/config.js (100%) rename {home => home-manager}/dotfiles/ags/media.js (100%) rename {home => home-manager}/dotfiles/ags/notif.js (100%) rename {home => home-manager}/dotfiles/ags/notification.js (100%) rename {home => home-manager}/dotfiles/ags/power.js (100%) rename {home => home-manager}/dotfiles/ags/settings.js (100%) rename {home => home-manager}/dotfiles/ags/style.css (100%) rename {home => home-manager}/dotfiles/ags/systemtray.js (100%) rename {home => home-manager}/dotfiles/ags/wifi.js (100%) rename {home => home-manager}/dotfiles/ags/workspaces.js (100%) create mode 100644 home-manager/dotfiles/default.nix rename {home => home-manager}/dotfiles/hypr/main.conf (100%) rename {home => home-manager}/dotfiles/hypr/otf.conf (100%) rename {home => home-manager}/dotfiles/hypr/pyprland.toml (100%) rename {home => home-manager}/dotfiles/swaylock/config (100%) rename {home => home-manager}/dotfiles/wal/templates/cava_config (100%) rename {home => home-manager}/dotfiles/wal/templates/colors-ags.css (100%) rename {home => home-manager}/dotfiles/wal/templates/colors-discord.css (100%) rename {home => home-manager}/dotfiles/wal/templates/colors-hypr.conf (100%) create mode 100644 home-manager/dotfiles/wayvnc/config create mode 100644 home-manager/dotfiles/wayvnc/rsa_key.pem create mode 100644 home-manager/dotfiles/wayvnc/rsa_key.pem.pub rename {home => home-manager}/flake.nix (65%) create mode 100644 home-manager/impermanence/default.nix rename {home => home-manager}/packages/default.nix (100%) rename {home => home-manager}/packages/external/default.nix (100%) rename {home => home-manager}/packages/external/flake.nix (100%) rename {home => home-manager}/packages/flake.nix (100%) rename {home => home-manager}/packages/scripts/default.nix (98%) rename {home => home-manager}/packages/scripts/flake.nix (100%) rename {home => home-manager}/programs/ags/flake.nix (100%) rename {home => home-manager}/programs/calcurse/default.nix (100%) rename {home => home-manager}/programs/flake.nix (82%) rename {home => home-manager}/programs/hyprland/flake.nix (92%) rename {home => home-manager}/programs/pywal/flake.nix (99%) rename {home => home-manager}/programs/rofi/default.nix (100%) rename {home => home-manager}/programs/rofi/flake.nix (100%) rename {home => home-manager}/programs/swaylock/default.nix (100%) rename home/programs/terminal/bat/bat.nix => home-manager/programs/terminal/bat/default.nix (100%) create mode 100644 home-manager/programs/terminal/default.nix rename home/programs/terminal/eza/eza.nix => home-manager/programs/terminal/eza/default.nix (100%) rename home/programs/terminal/fzf/fzf.nix => home-manager/programs/terminal/fzf/default.nix (100%) rename home/programs/terminal/kitty/kitty.nix => home-manager/programs/terminal/kitty/default.nix (100%) rename home/programs/terminal/tmux/tmux.nix => home-manager/programs/terminal/tmux/default.nix (100%) rename home/programs/terminal/zoxide/zoxide.nix => home-manager/programs/terminal/zoxide/default.nix (100%) rename home/programs/terminal/zsh/zsh.nix => home-manager/programs/terminal/zsh/default.nix (100%) rename {home => home-manager}/programs/wayvnc/default.nix (51%) rename {home => home-manager}/services/custom/default.nix (100%) rename {home => home-manager}/services/default.nix (100%) rename {home => home-manager}/services/mpd/default.nix (100%) delete mode 100644 home/dotfiles/default.nix delete mode 100644 home/impermanence/default.nix delete mode 100644 home/impermanence/flake.nix delete mode 100644 home/programs/terminal/bat/flake.nix delete mode 100644 home/programs/terminal/eza/flake.nix delete mode 100644 home/programs/terminal/flake.nix delete mode 100644 home/programs/terminal/fzf/flake.nix delete mode 100644 home/programs/terminal/kitty/flake.nix delete mode 100644 home/programs/terminal/tmux/flake.nix delete mode 100644 home/programs/terminal/zoxide/flake.nix delete mode 100644 home/programs/terminal/zsh/flake.nix create mode 100644 system-config/configuration/homebox/default.nix create mode 100644 system-config/configuration/homebox/disko.nix rename {system => system-config}/configuration/homebox/hardware-configuration.nix (92%) rename {system => system-config}/configuration/laptop/default.nix (100%) rename {system => system-config}/configuration/laptop/hardware-configuration.nix (100%) rename {system => system-config}/configuration/live/flake.nix (100%) rename {system => system-config}/etc/default.nix (100%) create mode 100755 system-config/flake.nix create mode 100644 system-config/packages/default.nix rename system/programs/ags/flake.nix => system-config/programs/ags/default.nix (67%) rename {system => system-config}/programs/flake.nix (85%) rename {system => system-config}/programs/git/default.nix (100%) rename {system => system-config}/programs/hyprland/flake.nix (92%) rename {system => system-config}/programs/nh/default.nix (100%) rename {system => system-config}/programs/steam/default.nix (100%) create mode 100644 system-config/services/default.nix rename {system => system-config}/services/ollama/default.nix (100%) rename {system => system-config}/services/openssh/default.nix (100%) rename {system => system-config}/services/pipewire/default.nix (100%) create mode 100644 system-config/services/sddm/flake.lock rename {system => system-config}/services/sddm/flake.nix (100%) rename {system => system-config}/services/sddm/themes/sugar-dark/flake.nix (100%) create mode 100644 system-config/services/sddm/themes/tokyo-night/flake.lock rename {system => system-config}/services/sddm/themes/tokyo-night/flake.nix (100%) delete mode 100644 system/configuration/default.nix delete mode 100644 system/configuration/homebox/default.nix delete mode 100644 system/disko/default.nix delete mode 100644 system/disko/disko.nix delete mode 100644 system/disko/disko_bonus.nix delete mode 100644 system/disko/flake.nix delete mode 100644 system/disko/impermanent.nix delete mode 100644 system/first_boot/default.nix delete mode 100755 system/flake.nix delete mode 100644 system/hardware-configuration.nix delete mode 100644 system/impermanence/default.nix delete mode 100644 system/impermanence/flake.nix delete mode 100644 system/packages/external/flake.nix delete mode 100644 system/packages/flake.nix delete mode 100644 system/packages/scripts/flake.nix delete mode 100644 system/services/flake.nix diff --git a/README.md b/README.md deleted file mode 100644 index 58f65a2..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# NixOS System Configs - -This is a repo for all of my nixos system configurations and isos - -# Goal: ->- to define configs for all my nixos machines ->- to create a **100% reproduceable** system that can be deployed **offline** and **unattended** - diff --git a/flake.lock b/flake.lock index dc11807..fdb2f5f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-16SMbNTMTa+acgZVO0MihmuQonvLo4Oy24fSzNvBKLw=", - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/ags", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/ags", "type": "path" }, "original": { - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/ags", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/ags", "type": "path" } }, @@ -34,18 +34,6 @@ "type": "github" } }, - "ags_3": { - "locked": { - "lastModified": 1, - "narHash": "sha256-xrkH8ezy3xf6rsOTdqMSIoAaWnPHHIXxIuxszEJAh3M=", - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags", - "type": "path" - }, - "original": { - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags", - "type": "path" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -136,18 +124,6 @@ "type": "github" } }, - "bat": { - "locked": { - "lastModified": 1, - "narHash": "sha256-FJjoGC78eG2j8FTz8sELu6Cujzec4OumAZqhHoTyRcw=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/bat", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/bat", - "type": "path" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -172,6 +148,28 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "digital": { "flake": false, "locked": { @@ -188,7 +186,6 @@ "disko": { "inputs": { "nixpkgs": [ - "system", "nixpkgs" ] }, @@ -214,38 +211,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-sdsD7OzeWyBdSRpf90GeDM/xCoNIdAVh1OsPnqLdlkU=", - "path": "/nix/store/h1znng5ij9xx53pxls6m73g1wv49lcqy-source/external", + "path": "/nix/store/nxabvxpgvqsxhb0cmnm5c3brih3w7qiv-source/external", "type": "path" }, "original": { - "path": "/nix/store/h1znng5ij9xx53pxls6m73g1wv49lcqy-source/external", - "type": "path" - } - }, - "external_2": { - "inputs": { - "waveforms": "waveforms" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-BWhHfDAKpNghzSyoO3dU1EPLxl/ADB654NKb3JORQFE=", - "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", - "type": "path" - }, - "original": { - "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", - "type": "path" - } - }, - "eza": { - "locked": { - "lastModified": 1, - "narHash": "sha256-k5AmFL4QVNTziCDiw5UBRMQn1JYpCsawHCtn95t9rYw=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/eza", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/eza", + "path": "/nix/store/nxabvxpgvqsxhb0cmnm5c3brih3w7qiv-source/external", "type": "path" } }, @@ -296,6 +266,20 @@ } }, "flake-compat_4": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -353,6 +337,46 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -371,16 +395,22 @@ "type": "github" } }, - "fzf": { + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, "locked": { - "lastModified": 1, - "narHash": "sha256-GbjneK0hMLwVcIwri+7tIHPP6dI4IgQW2YsGxlbyPmc=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/fzf", - "type": "path" + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" }, "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/fzf", - "type": "path" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "git-hooks": { @@ -422,6 +452,39 @@ "type": "github" } }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "nixvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727805723, + "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -473,6 +536,29 @@ } }, "gitignore_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "system", @@ -564,6 +650,28 @@ "type": "github" } }, + "home-manager_4": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -646,12 +754,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-FbSB/VPF1F8BjjGejCs9hzRK4uo5RNMoIdMdl58mEFM=", - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/hyprland", + "narHash": "sha256-Np+6rlFj1UaiFZKO03Y3p8HaS9lXalRI8nhvwH6DqR8=", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/hyprland", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/hyprland", "type": "path" } }, @@ -731,11 +839,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729378105, - "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", + "lastModified": 1729553322, + "narHash": "sha256-7uYakoqf6hWN2vCAbWD5Eq3Redt7Uhgtbz0vbIVD730=", "ref": "refs/heads/main", - "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", - "revCount": 5362, + "rev": "5e96d738e698f22969ca502d042d5751711c6d8a", + "revCount": 5365, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -752,12 +860,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-lXJ/q9VTQkjT7mXnTPXhiQ9FifWKlgonm9RvlVYO7lc=", - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland", + "narHash": "sha256-2oL/f1CsvMoNo++D6/MCUxpSwaaFcldWpCgIkH4wJEI=", + "path": "/nix/store/abgmlh8jxscwab0v72xzhcrmq78qfncp-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland", + "path": "/nix/store/abgmlh8jxscwab0v72xzhcrmq78qfncp-source/hyprland", "type": "path" } }, @@ -771,15 +879,15 @@ "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_12", "pre-commit-hooks": "pre-commit-hooks_2", - "systems": "systems_4", + "systems": "systems_5", "xdph": "xdph_2" }, "locked": { - "lastModified": 1729378105, - "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", + "lastModified": 1729553322, + "narHash": "sha256-7uYakoqf6hWN2vCAbWD5Eq3Redt7Uhgtbz0vbIVD730=", "ref": "refs/heads/main", - "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", - "revCount": 5362, + "rev": "5e96d738e698f22969ca502d042d5751711c6d8a", + "revCount": 5365, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1005,18 +1113,6 @@ "type": "github" } }, - "kitty": { - "locked": { - "lastModified": 1, - "narHash": "sha256-GzevfSGVuMyFSa9mgoxCUGDNY7hzocMkXS+BIEC/1iw=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/kitty", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/kitty", - "type": "path" - } - }, "nathan": { "inputs": { "home-manager": "home-manager_2", @@ -1025,13 +1121,13 @@ "prgms": "prgms" }, "locked": { - "lastModified": 1, - "narHash": "sha256-7wLYLrDNarCmzUZ8N0zArCdk833QnmAcO+vQFJJ8fZc=", - "path": "/nix/store/kmh4vpq64vvcczj3wih7zvb84q3w4jk1-source/home", + "lastModified": 0, + "narHash": "sha256-Cc8Y37NuVzPRWEYKOembvCwX9F+vgOluhoPzVfEtafw=", + "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/home-manager", "type": "path" }, "original": { - "path": "/nix/store/kmh4vpq64vvcczj3wih7zvb84q3w4jk1-source/home", + "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/home-manager", "type": "path" } }, @@ -1059,13 +1155,35 @@ "type": "github" } }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -1087,6 +1205,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -1121,11 +1251,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1137,11 +1267,11 @@ }, "nixpkgs-us_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1153,30 +1283,34 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_11": { "locked": { - "lastModified": 0, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", - "path": "/nix/store/m1szqwijms610n6325mwjswslha4nd92-source", - "type": "path" + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_12": { @@ -1197,11 +1331,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -1277,11 +1411,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -1293,11 +1427,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -1309,11 +1443,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -1335,11 +1469,11 @@ "lastModified": 1727986301, "narHash": "sha256-EXfHCw4gd6Ck8pu8tyHrg6pjv4Nw9u0ZD9YRN/LjMwM=", "type": "git", - "url": "file:///home/nathan/Projects/Nixvim" + "url": "file:///ssd1/Projects/Nixvim" }, "original": { "type": "git", - "url": "file:///home/nathan/Projects/Nixvim" + "url": "file:///ssd1/Projects/Nixvim" } }, "nixvim_2": { @@ -1368,6 +1502,51 @@ "type": "github" } }, + "nixvim_3": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_10", + "nixvim": "nixvim_4" + }, + "locked": { + "dirtyRev": "e6cb7d523142dc038c816fe5be57c19cf7a8d5f3-dirty", + "dirtyShortRev": "e6cb7d5-dirty", + "lastModified": 1727986301, + "narHash": "sha256-EXfHCw4gd6Ck8pu8tyHrg6pjv4Nw9u0ZD9YRN/LjMwM=", + "type": "git", + "url": "file:///ssd1/Projects/Nixvim" + }, + "original": { + "type": "git", + "url": "file:///ssd1/Projects/Nixvim" + } + }, + "nixvim_4": { + "inputs": { + "devshell": "devshell_2", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks_2", + "home-manager": "home-manager_4", + "nix-darwin": "nix-darwin_2", + "nixpkgs": "nixpkgs_11", + "nuschtosSearch": "nuschtosSearch_2", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -1393,6 +1572,29 @@ "type": "github" } }, + "nuschtosSearch_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727599661, + "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "owner": "NuschtOS", + "repo": "search", + "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "packages": { "inputs": { "external": "external", @@ -1401,27 +1603,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KRZp7PyNRlGtLqdoXVtcjtn6JDEFbDFUkr/2meek/04=", - "path": "/nix/store/08k1vc395rfdis8fya9pwnh725h31pcs-source/packages", + "narHash": "sha256-Wn6kB5u0r72AAftiGN1BfntHfsF53t2yPaDDfDxwkvw=", + "path": "/nix/store/hiwmkbr5rs7wjzwyr392ybk423ldqzi9-source/packages", "type": "path" }, "original": { - "path": "/nix/store/08k1vc395rfdis8fya9pwnh725h31pcs-source/packages", - "type": "path" - } - }, - "pckgs": { - "inputs": { - "external": "external_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/packages", - "type": "path" - }, - "original": { - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/packages", + "path": "/nix/store/hiwmkbr5rs7wjzwyr392ybk423ldqzi9-source/packages", "type": "path" } }, @@ -1454,8 +1641,8 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_3", + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_4", "nixpkgs": [ "system", "prgms", @@ -1485,33 +1672,31 @@ "hyprland": "hyprland", "nixvim": "nixvim", "pywal": "pywal", - "rofi": "rofi", - "terminal": "terminal" + "rofi": "rofi" }, "locked": { "lastModified": 1, - "narHash": "sha256-ZK0b6O2RkZCprYDS6kjUqodElzONOQyL5cOdZ62Lr/c=", - "path": "/nix/store/08k1vc395rfdis8fya9pwnh725h31pcs-source/programs", + "narHash": "sha256-1EI4g3qL+fwBA9WmtgVMdeyFBHZcxMa4gwZ8L5trR9g=", + "path": "/nix/store/hiwmkbr5rs7wjzwyr392ybk423ldqzi9-source/programs", "type": "path" }, "original": { - "path": "/nix/store/08k1vc395rfdis8fya9pwnh725h31pcs-source/programs", + "path": "/nix/store/hiwmkbr5rs7wjzwyr392ybk423ldqzi9-source/programs", "type": "path" } }, "prgms_2": { "inputs": { - "ags": "ags_3", "hyprland": "hyprland_3" }, "locked": { "lastModified": 1, - "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=", - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/programs", + "narHash": "sha256-HAuZ9X84fuwUcit6NWUoJCjHj+29nST/YN6Rs8JQugY=", + "path": "/nix/store/814iw4ixmg4cs293i1nn1cazdq50ydna-source/programs", "type": "path" }, "original": { - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/programs", + "path": "/nix/store/814iw4ixmg4cs293i1nn1cazdq50ydna-source/programs", "type": "path" } }, @@ -1524,12 +1709,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-4mwfSmoMooqMRTneT8F0xdoHx1iVhja0VVJFmecj1+s=", - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/pywal", + "narHash": "sha256-q52l98Ciud9fPcPe5/+9Emn6rB1vUQj7u/dfne03yyI=", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/pywal", "type": "path" }, "original": { - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/pywal", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/pywal", "type": "path" } }, @@ -1553,31 +1738,34 @@ "locked": { "lastModified": 1, "narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=", - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/rofi", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/rofi", "type": "path" }, "original": { - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/rofi", + "path": "/nix/store/x5zxgpagp5l1yzcbf4r4nmzdriplsaxq-source/rofi", "type": "path" } }, "root": { "inputs": { + "disko": "disko", "home-manager": "home-manager", + "impermanence": "impermanence", "nathan": "nathan", "nixpkgs": "nixpkgs_9", + "nixvim": "nixvim_3", "system": "system" } }, "scripts": { "locked": { "lastModified": 1, - "narHash": "sha256-Xqjo17tstwvRuEesx+lptIicPq+u9IVUuSwbZidz5Yg=", - "path": "/nix/store/h1znng5ij9xx53pxls6m73g1wv49lcqy-source/scripts", + "narHash": "sha256-yF+8Sz8FXVmLivfcfXOtRGBQ02gxJof8WpWMF5GZ2RU=", + "path": "/nix/store/nxabvxpgvqsxhb0cmnm5c3brih3w7qiv-source/scripts", "type": "path" }, "original": { - "path": "/nix/store/h1znng5ij9xx53pxls6m73g1wv49lcqy-source/scripts", + "path": "/nix/store/nxabvxpgvqsxhb0cmnm5c3brih3w7qiv-source/scripts", "type": "path" } }, @@ -1587,12 +1775,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-/+FJTRzHmHfZLb8yU/wMyGyMZFJ53mJNRzc5d4Gzwjw=", - "path": "/nix/store/4kma722n7j1p0273bp5j7pqa0znivvcw-source/sddm", + "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", + "path": "/nix/store/814iw4ixmg4cs293i1nn1cazdq50ydna-source/services/sddm", "type": "path" }, "original": { - "path": "/nix/store/4kma722n7j1p0273bp5j7pqa0znivvcw-source/sddm", + "path": "/nix/store/814iw4ixmg4cs293i1nn1cazdq50ydna-source/services/sddm", "type": "path" } }, @@ -1618,11 +1806,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1729397826, - "narHash": "sha256-PKiCeeV0D8qBRVzlGlx3DE+/0WU8U8maMjB2rRJMBBA=", + "lastModified": 1729570661, + "narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1a8fa34b656d67c1d7d4c2b76cba03bf4d65dee4", + "rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a", "type": "github" }, "original": { @@ -1631,38 +1819,19 @@ "type": "github" } }, - "srvcs": { - "inputs": { - "sddm": "sddm" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-z2Uyh8lc8Mi5hPUGqRw1wVnTKNwGsG75CCZ8gZ2LKwk=", - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/services", - "type": "path" - }, - "original": { - "path": "/nix/store/y4q2mnaxn8ik9wk8sk7cwn1grqx4a0g7-source/services", - "type": "path" - } - }, "system": { "inputs": { - "disko": "disko", - "impermanence": "impermanence", - "nixpkgs": "nixpkgs_10", - "pckgs": "pckgs", "prgms": "prgms_2", - "srvcs": "srvcs" + "sddm": "sddm" }, "locked": { "lastModified": 1, - "narHash": "sha256-4u+wOg7R+zQwT9NzHgDdRKT+n34JUSunBOsD1f95mPo=", - "path": "/nix/store/kmh4vpq64vvcczj3wih7zvb84q3w4jk1-source/system", + "narHash": "sha256-Ipi9gad6XxzVUDHKVSWXrLRgkeEh7DWqVAhWYPHfiAc=", + "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/system-config", "type": "path" }, "original": { - "path": "/nix/store/kmh4vpq64vvcczj3wih7zvb84q3w4jk1-source/system", + "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/system-config", "type": "path" } }, @@ -1712,6 +1881,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1726,39 +1910,18 @@ "type": "github" } }, - "terminal": { - "inputs": { - "bat": "bat", - "eza": "eza", - "fzf": "fzf", - "kitty": "kitty", - "tmux": "tmux", - "zoxide": "zoxide", - "zsh": "zsh" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=", - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/terminal", - "type": "path" - }, - "original": { - "path": "/nix/store/6sbs2aysmg5gin8hwi7233q6zpq3iy0b-source/terminal", - "type": "path" - } - }, "theme": { "inputs": { "repo": "repo" }, "locked": { "lastModified": 1, - "narHash": "sha256-4qcgTKJv2uerh2pzxBzFRaYh12KBI1ZlMhMtkl/MI90=", - "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night", + "narHash": "sha256-eXmGZXA4mlXGERWWjh2QZCQV8GphWPf+yKt+Fg16OOI=", + "path": "/nix/store/f337l6r301bs4qngvfkx5ya8h9801xfy-source/themes/tokyo-night", "type": "path" }, "original": { - "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night", + "path": "/nix/store/f337l6r301bs4qngvfkx5ya8h9801xfy-source/themes/tokyo-night", "type": "path" } }, @@ -1780,18 +1943,6 @@ "type": "github" } }, - "tmux": { - "locked": { - "lastModified": 1, - "narHash": "sha256-vkwha2aJoI69KMpfc6msyrBqJ1oy+Rhsq+Cja2A7Fzw=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/tmux", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/tmux", - "type": "path" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1816,21 +1967,25 @@ "type": "github" } }, - "waveforms": { + "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1728376004, - "narHash": "sha256-mTib24PapKexOaTUNsGiTtZFaXR2LYaQazVBGzlnAig=", - "owner": "liff", - "repo": "waveforms-flake", - "rev": "1d58c63da1ce63a2896d13a3d66238ff9aca89e4", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { - "owner": "liff", - "repo": "waveforms-flake", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, @@ -1951,30 +2106,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zoxide": { - "locked": { - "lastModified": 1, - "narHash": "sha256-eBI7Be8dZ4zYMy+swgH83pTBFblMwUiK1Xc5PoyvwGE=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zoxide", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zoxide", - "type": "path" - } - }, - "zsh": { - "locked": { - "lastModified": 1, - "narHash": "sha256-BEUs7EQM66rDZ7QFVXy7PFq1qxsHmIwnwoEl7qJolc0=", - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zsh", - "type": "path" - }, - "original": { - "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zsh", - "type": "path" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6e17d57..09ed030 100644 --- a/flake.nix +++ b/flake.nix @@ -1,159 +1,40 @@ { - description = "Build Entire System"; - - inputs = { - - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - - home-manager = { - url = "github:nix-community/home-manager/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nathan.url = "./home"; - - system.url = "./system"; - #system.inputs.diskoConfig.inputs.nixpkgs.follows = "nixpkgs"; - - }; - - outputs = { self, nixpkgs, ... }@core_inputs: let - system = "x86_64-linux"; - iso_system = "x86_64-linux"; - - host = "homebox"; - username = "nathan"; - - devices = { - main = "/dev/nvme0n1"; - bonus.disk1 = "/dev/nvme1n1"; - }; - - in { - inputs.home-manager.useGlobalPkgs = true; - - nixosConfigurations.${host} = nixpkgs.lib.nixosSystem { - - inherit system; - specialArgs = { - core_inputs = (core_inputs // {inherit host;}); - }; - - modules = [ - core_inputs.system.nixosModule - core_inputs.home-manager.nixosModules.home-manager - - ({ lib, ... }: { - sysconfig = { - ${host}.enable = true; - opts = { - firstBoot = true; - inherit host username devices; - }; - }; - disko = { - enable = true; - impermanent = true; - }; - }) - ]; - - }; - - nixosConfigurations.iso = nixpkgs.lib.nixosSystem { - #inherit iso_system; - - specialArgs = { - core_inputs = (core_inputs // {host = "installer";}); - }; - - modules = [ - - ({ lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - ]; - - home-manager.users.${username}.homeconfig = { - minimal = true; - externalPackages.enable = false; - calcurse.enable = false; - wayvnc.enable = true; - rofi.enable = true; - mpd.enable = false; - wal.enable = true; - ags.enable = true; - hyprland.enable = true; - swaylock.enable = true; - }; - - sysconfig = { - opts = { - firstBoot = true; - host = "installer"; - inherit username; - openssh.enable = true; - hyprland.enable = true; - ags.enable = true; - pipewire.enable = true; - git.enable = true; - steam.enable = false; - nh.enable = false; - }; - }; - - disko.enable = lib.mkForce false; - - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - }; - - networking = { - hostName = "installer"; - firewall.allowedTCPPorts = [ 22 ]; - }; - - nixpkgs.hostPlatform = iso_system; - - - }) - - core_inputs.system.nixosModule - core_inputs.home-manager.nixosModules.home-manager - ]; - - }; - - packages.${iso_system}.default = self.nixosConfigurations.iso.config.system.build.isoImage; - - homeConfigurations."nathan" = core_inputs.home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; - extraSpecialArgs = { inherit core_inputs; }; - - modules = [ - core_inputs.nathan.homeManagerModule - - { - - homeconfig = { - minimal = false; - externalPackages.enable = true; - calcurse.enable = true; - wayvnc.enable = true; - rofi.enable = true; - mpd.enable = true; - wal.enable = true; - ags.enable = true; - hyprland.enable = true; - swaylock.enable = true; - }; - } - ]; - }; + description = "Nixos config flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; }; + impermanence = { + url = "github:nix-community/impermanence"; + }; + + home-manager = { + url = "github:nix-community/home-manager/release-24.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + system.url = "./system-config"; + + nixvim.url = "/ssd1/Projects/Nixvim"; + + nathan.url = "./home-manager"; + + }; + + outputs = {nixpkgs, ...} @ inputs: + { + nixosConfigurations.homebox = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + + ./system-config/configuration/homebox + + ]; + }; + }; } diff --git a/home-manager/default.nix b/home-manager/default.nix new file mode 100644 index 0000000..aa82d9a --- /dev/null +++ b/home-manager/default.nix @@ -0,0 +1,8 @@ +{ ... }: { + + imports = [ + ./dotfiles + ./impermanence + ./services + ]; +} diff --git a/home/dotfiles/Wallpaper/bluescape.jpg b/home-manager/dotfiles/Wallpaper/bluescape.jpg similarity index 100% rename from home/dotfiles/Wallpaper/bluescape.jpg rename to home-manager/dotfiles/Wallpaper/bluescape.jpg diff --git a/home/dotfiles/Wallpaper/galaxy.jpg b/home-manager/dotfiles/Wallpaper/galaxy.jpg similarity index 100% rename from home/dotfiles/Wallpaper/galaxy.jpg rename to home-manager/dotfiles/Wallpaper/galaxy.jpg diff --git a/home/dotfiles/Wallpaper/kurisu.gif b/home-manager/dotfiles/Wallpaper/kurisu.gif similarity index 100% rename from home/dotfiles/Wallpaper/kurisu.gif rename to home-manager/dotfiles/Wallpaper/kurisu.gif diff --git a/home/dotfiles/Wallpaper/kurisu.jpg b/home-manager/dotfiles/Wallpaper/kurisu.jpg similarity index 100% rename from home/dotfiles/Wallpaper/kurisu.jpg rename to home-manager/dotfiles/Wallpaper/kurisu.jpg diff --git a/home/dotfiles/Wallpaper/llenn.png b/home-manager/dotfiles/Wallpaper/llenn.png similarity index 100% rename from home/dotfiles/Wallpaper/llenn.png rename to home-manager/dotfiles/Wallpaper/llenn.png diff --git a/home/dotfiles/Wallpaper/megumin.png b/home-manager/dotfiles/Wallpaper/megumin.png similarity index 100% rename from home/dotfiles/Wallpaper/megumin.png rename to home-manager/dotfiles/Wallpaper/megumin.png diff --git a/home/dotfiles/Wallpaper/megumin1.gif b/home-manager/dotfiles/Wallpaper/megumin1.gif similarity index 100% rename from home/dotfiles/Wallpaper/megumin1.gif rename to home-manager/dotfiles/Wallpaper/megumin1.gif diff --git a/home/dotfiles/Wallpaper/megumin2.gif b/home-manager/dotfiles/Wallpaper/megumin2.gif similarity index 100% rename from home/dotfiles/Wallpaper/megumin2.gif rename to home-manager/dotfiles/Wallpaper/megumin2.gif diff --git a/home/dotfiles/Wallpaper/ngnl.jpg b/home-manager/dotfiles/Wallpaper/ngnl.jpg similarity index 100% rename from home/dotfiles/Wallpaper/ngnl.jpg rename to home-manager/dotfiles/Wallpaper/ngnl.jpg diff --git a/home/dotfiles/Wallpaper/orangescape.jpg b/home-manager/dotfiles/Wallpaper/orangescape.jpg similarity index 100% rename from home/dotfiles/Wallpaper/orangescape.jpg rename to home-manager/dotfiles/Wallpaper/orangescape.jpg diff --git a/home/dotfiles/Wallpaper/rezero.gif b/home-manager/dotfiles/Wallpaper/rezero.gif similarity index 100% rename from home/dotfiles/Wallpaper/rezero.gif rename to home-manager/dotfiles/Wallpaper/rezero.gif diff --git a/home/dotfiles/Wallpaper/sao.gif b/home-manager/dotfiles/Wallpaper/sao.gif similarity index 100% rename from home/dotfiles/Wallpaper/sao.gif rename to home-manager/dotfiles/Wallpaper/sao.gif diff --git a/home/dotfiles/Wallpaper/sao.png b/home-manager/dotfiles/Wallpaper/sao.png similarity index 100% rename from home/dotfiles/Wallpaper/sao.png rename to home-manager/dotfiles/Wallpaper/sao.png diff --git a/home/dotfiles/Wallpaper/sinon.gif b/home-manager/dotfiles/Wallpaper/sinon.gif similarity index 100% rename from home/dotfiles/Wallpaper/sinon.gif rename to home-manager/dotfiles/Wallpaper/sinon.gif diff --git a/home/dotfiles/ags/README.md b/home-manager/dotfiles/ags/README.md similarity index 100% rename from home/dotfiles/ags/README.md rename to home-manager/dotfiles/ags/README.md diff --git a/home/dotfiles/ags/bluetooth.js b/home-manager/dotfiles/ags/bluetooth.js similarity index 100% rename from home/dotfiles/ags/bluetooth.js rename to home-manager/dotfiles/ags/bluetooth.js diff --git a/home/dotfiles/ags/brightness.js b/home-manager/dotfiles/ags/brightness.js similarity index 100% rename from home/dotfiles/ags/brightness.js rename to home-manager/dotfiles/ags/brightness.js diff --git a/home/dotfiles/ags/clock.js b/home-manager/dotfiles/ags/clock.js similarity index 100% rename from home/dotfiles/ags/clock.js rename to home-manager/dotfiles/ags/clock.js diff --git a/home/dotfiles/ags/config.js b/home-manager/dotfiles/ags/config.js similarity index 100% rename from home/dotfiles/ags/config.js rename to home-manager/dotfiles/ags/config.js diff --git a/home/dotfiles/ags/media.js b/home-manager/dotfiles/ags/media.js similarity index 100% rename from home/dotfiles/ags/media.js rename to home-manager/dotfiles/ags/media.js diff --git a/home/dotfiles/ags/notif.js b/home-manager/dotfiles/ags/notif.js similarity index 100% rename from home/dotfiles/ags/notif.js rename to home-manager/dotfiles/ags/notif.js diff --git a/home/dotfiles/ags/notification.js b/home-manager/dotfiles/ags/notification.js similarity index 100% rename from home/dotfiles/ags/notification.js rename to home-manager/dotfiles/ags/notification.js diff --git a/home/dotfiles/ags/power.js b/home-manager/dotfiles/ags/power.js similarity index 100% rename from home/dotfiles/ags/power.js rename to home-manager/dotfiles/ags/power.js diff --git a/home/dotfiles/ags/settings.js b/home-manager/dotfiles/ags/settings.js similarity index 100% rename from home/dotfiles/ags/settings.js rename to home-manager/dotfiles/ags/settings.js diff --git a/home/dotfiles/ags/style.css b/home-manager/dotfiles/ags/style.css similarity index 100% rename from home/dotfiles/ags/style.css rename to home-manager/dotfiles/ags/style.css diff --git a/home/dotfiles/ags/systemtray.js b/home-manager/dotfiles/ags/systemtray.js similarity index 100% rename from home/dotfiles/ags/systemtray.js rename to home-manager/dotfiles/ags/systemtray.js diff --git a/home/dotfiles/ags/wifi.js b/home-manager/dotfiles/ags/wifi.js similarity index 100% rename from home/dotfiles/ags/wifi.js rename to home-manager/dotfiles/ags/wifi.js diff --git a/home/dotfiles/ags/workspaces.js b/home-manager/dotfiles/ags/workspaces.js similarity index 100% rename from home/dotfiles/ags/workspaces.js rename to home-manager/dotfiles/ags/workspaces.js diff --git a/home-manager/dotfiles/default.nix b/home-manager/dotfiles/default.nix new file mode 100644 index 0000000..3468712 --- /dev/null +++ b/home-manager/dotfiles/default.nix @@ -0,0 +1,26 @@ +{ config, lib, ... }: { + + config = lib.mkMerge [ + + (lib.mkIf config.homeconfig.ags.enable { + home.file."ags" = { source = ./ags; target = ".config/ags"; recursive = true; }; + }) + + (lib.mkIf config.homeconfig.hyprland.enable { + home.file = { + "Wallpaper" = { source = ./Wallpaper; target = "Pictures/Wallpaper"; recursive = true; }; + "hyprland" = { source = ./hypr; target = ".config/hypr"; recursive = true; }; + }; + }) + + (lib.mkIf config.homeconfig.swaylock.enable { + + home.file."swaylock" = { source = ./swaylock; target = ".config/swaylock"; recursive = true; }; + }) + + (lib.mkIf config.homeconfig.wal.enable { + + home.file."wal" = { source = ./wal/templates; target = ".config/wal/templates"; recursive = true; }; + }) + ]; +} diff --git a/home/dotfiles/hypr/main.conf b/home-manager/dotfiles/hypr/main.conf similarity index 100% rename from home/dotfiles/hypr/main.conf rename to home-manager/dotfiles/hypr/main.conf diff --git a/home/dotfiles/hypr/otf.conf b/home-manager/dotfiles/hypr/otf.conf similarity index 100% rename from home/dotfiles/hypr/otf.conf rename to home-manager/dotfiles/hypr/otf.conf diff --git a/home/dotfiles/hypr/pyprland.toml b/home-manager/dotfiles/hypr/pyprland.toml similarity index 100% rename from home/dotfiles/hypr/pyprland.toml rename to home-manager/dotfiles/hypr/pyprland.toml diff --git a/home/dotfiles/swaylock/config b/home-manager/dotfiles/swaylock/config similarity index 100% rename from home/dotfiles/swaylock/config rename to home-manager/dotfiles/swaylock/config diff --git a/home/dotfiles/wal/templates/cava_config b/home-manager/dotfiles/wal/templates/cava_config similarity index 100% rename from home/dotfiles/wal/templates/cava_config rename to home-manager/dotfiles/wal/templates/cava_config diff --git a/home/dotfiles/wal/templates/colors-ags.css b/home-manager/dotfiles/wal/templates/colors-ags.css similarity index 100% rename from home/dotfiles/wal/templates/colors-ags.css rename to home-manager/dotfiles/wal/templates/colors-ags.css diff --git a/home/dotfiles/wal/templates/colors-discord.css b/home-manager/dotfiles/wal/templates/colors-discord.css similarity index 100% rename from home/dotfiles/wal/templates/colors-discord.css rename to home-manager/dotfiles/wal/templates/colors-discord.css diff --git a/home/dotfiles/wal/templates/colors-hypr.conf b/home-manager/dotfiles/wal/templates/colors-hypr.conf similarity index 100% rename from home/dotfiles/wal/templates/colors-hypr.conf rename to home-manager/dotfiles/wal/templates/colors-hypr.conf diff --git a/home-manager/dotfiles/wayvnc/config b/home-manager/dotfiles/wayvnc/config new file mode 100644 index 0000000..b45b636 --- /dev/null +++ b/home-manager/dotfiles/wayvnc/config @@ -0,0 +1,6 @@ +use_relative_paths=true +address=0.0.0.0 +enable_auth=true +username=nathan +password=//falconAdjacent42 +rsa_private_key_file=rsa_key.pem diff --git a/home-manager/dotfiles/wayvnc/rsa_key.pem b/home-manager/dotfiles/wayvnc/rsa_key.pem new file mode 100644 index 0000000..fdcdea6 --- /dev/null +++ b/home-manager/dotfiles/wayvnc/rsa_key.pem @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG4gIBAAKCAYEAskZTWfnj4uUDsPq51eAXkxXeuHexT2H4Q3sFLgnP+B1zv9me +YgQeDK8tSN089Kukz6jYA/Wd8U66iq0TKHGsgj/AotL00Kan+J75huvnO+abGjkI +ovl7+z+E9wnqlmxbFC8r5xD5naQbwL+TKjGm6jcI6JPp3+GI2MMnC6YYUO8Zrns6 +K6mb/TBNjctHn3DGRL9QF0n/LIlOhVv+VkBiMjvana2zo7YdEPmENG8HPIR6tRQI +/gI8UExlgL4d6O7RxJTAogIEnrZxsHAAOnmzDVXIp3nSug4pseiHbAc9OVNon5iN +Z3oRK/SQWdkVS/4HZ/X+MZLh267+2rOZEA88icw3OIedt04l33l8ZAUlJ4/OKpPe +sotURvdkYYPCH7Ucg9TBLRJxekYuJxGV5ih4imWFRkGzoGKBE5D7iYppjDWwVUmc +k3SPMaXIAxjNdxSgYh84Ysvuht2nBoI3s+D4yoBqfX76fOz6OsQHIOuxY3PKM57E +gw4u+I7zfz27lgt1AgMBAAECggGADZGWgkvBQXTVCTFEJLGq/OBv9IVaD8sxBkQ3 +2pwXlQn7Oqs5eu29f15AtmhUXXqU9dM8wcX96mIBU7dYAaUi3Q6bvsJxeYU9vDzi +8n1EOvk5Bxyd+ipX+k47p6ijDyWz8IwLx0kxxOkhNAeNj9GtcFH8OEuA92MAmeyP +xu5MF0wWt2kcpKC2Ef+NRfeml2crez8LPWjxGZAuOeGmSlh/9AfXNb1Rsp1HuauF +svUozVcRMEGt0rt6OlH32P34/Wom/5sau3/aTKl5+98WbWQqv2hAHMNyRb6p/jjC +1Y3NTa8u75ly9/FDn2ovdUDlGEQT5S+lRMNuLTOhq1BuKtdEl0Wqq1/PQa8zQKcT +3plN97Il/p9XVqTpBqeP7UlmP/aVxD4tgEzlneRfraivwOvlwImEbB+4LJ79xxbE +b3BiSwCo7frnoGG6GIja10qhth4yn3Q0KbPYlROUvsiwp6c2Hnlvt9/eR4lKS4CP +nblyU40EKIDasC+D7bx3eo4KPrN/AoHBANYfsqSyx9D5spQTvyOh5OUqO2IoLX/m +mFlimvSdIlhxEGX5Ux/Y1lZ/GZZvl8dTWYqU2xwWIG0kXv2yrq9eNiVuEBG0GYCK +e48KiSyatZMIiULgWLcpfQWuYfHwXQz3kbLpT1BTeFRnhVp++pX6uJmsRnQdHwoU +RgIC49ZEiFfVU6HYNUbg1Eodif+IH3izLMNgW4ZKCRqmhkgvOFGzKosqTODoU2CX +LShrpyKdeYZSYcCTsHGOCVxpJrmwhkrdRwKBwQDVI89J/Z61zUe5Bc6q5w0VliL8 +rf9uceAJ7PXWTVij5hMgNpFrjGpUE0aZwu1LdEZIe0XJmjpUabksS9tp5En91Vyk +g+dqMPrE6vAnW7/KovKbPAwjiL1K/vZ+7MPsb9gYdeOec4YO/vfapFKMWe8yK9L8 +XQzeZ5q+jKeBLnr0x8o8WnJgCSLDC3A0YQmDj6j2MSayvbFAqk3PrKZ3NmStsQnS +QGnU8UZXVa9MD31b90ME5nHwjTPZZU9uf31iP2MCgcBAdyyen2C/Tt3v7P4H6U7z +m8JjK/t+3VsS1jgW21Qi0m+AdA8NsIffZMa8Xv6QOUzlBynsi9DZazDaKrii/bdJ +j5hw7AsdgxPuHdrsvetayCAjLU4oXupQEo9UeuxY4hRQjCOf6HF63+vrMf2Zt/Fp ++s7/WGEm9LGbG2mi8eEmqIhUWra3jyr64WfRshbfjPo2HEWR6apSBr647taC6nEt +kt+weuHXW8xxte+M4WJcCWN6yjw+A+hXlSTelQHpejMCgcAo7qmeghB6xaOiitT3 +yUuf+6dYc2n8oe3uug00TMJbJ5JAu3oN93dsEg+a8+5ycTAWN2ZdozrUf0FKmn7W +xTrYfqM+DP7iS+m864mXZW1d0xFYcp26LUZ9Ip3gHkQ6IfiUKf++rFzwgFLFMI2R +2quvLO9l+9C+3ZLASW7Zxj1iyQOzt4MDon2Ei6vOw1v6YhqGvUW7SebCjnJHEdce +Sdnn6XoDYM9yT6u8lf4GU2s1wDSkukTjd5qfg29PvzgrKBUCgcB7lMeZT08NBsdT +Imgy0HfLQNmAK3adugWGA/mzZJRYEWb9sUrs8xz5ynePXUYFzUCKYFQaHjiRJcHf +ni0NtEogmyz6skw7ZV+Gzc1p2OqxwazzXfOrpOwFXCCDaqiFzfEO7jfC89XbzlOZ +it0zuMS0fp5prmGBg7bdhZ9MkBny+YjRAgma5zkvh2S99B89ZpTeplNUqssV0JLx +LcN0moCV2RdiSSkOFhanD+r+iAJnMOxBcYVKJL4hp2vK3P339CY= +-----END RSA PRIVATE KEY----- diff --git a/home-manager/dotfiles/wayvnc/rsa_key.pem.pub b/home-manager/dotfiles/wayvnc/rsa_key.pem.pub new file mode 100644 index 0000000..852b274 --- /dev/null +++ b/home-manager/dotfiles/wayvnc/rsa_key.pem.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCyRlNZ+ePi5QOw+rnV4BeTFd64d7FPYfhDewUuCc/4HXO/2Z5iBB4Mry1I3Tz0q6TPqNgD9Z3xTrqKrRMocayCP8Ci0vTQpqf4nvmG6+c75psaOQii+Xv7P4T3CeqWbFsULyvnEPmdpBvAv5MqMabqNwjok+nf4YjYwycLphhQ7xmuezorqZv9ME2Ny0efcMZEv1AXSf8siU6FW/5WQGIyO9qdrbOjth0Q+YQ0bwc8hHq1FAj+AjxQTGWAvh3o7tHElMCiAgSetnGwcAA6ebMNVcinedK6Dimx6IdsBz05U2ifmI1nehEr9JBZ2RVL/gdn9f4xkuHbrv7as5kQDzyJzDc4h523TiXfeXxkBSUnj84qk96yi1RG92Rhg8IftRyD1MEtEnF6Ri4nEZXmKHiKZYVGQbOgYoETkPuJimmMNbBVSZyTdI8xpcgDGM13FKBiHzhiy+6G3acGgjez4PjKgGp9fvp87Po6xAcg67Fjc8oznsSDDi74jvN/PbuWC3U= root@homebox diff --git a/home/flake.nix b/home-manager/flake.nix similarity index 65% rename from home/flake.nix rename to home-manager/flake.nix index da76934..41602bd 100644 --- a/home/flake.nix +++ b/home-manager/flake.nix @@ -13,6 +13,7 @@ prgms.url = "./programs"; packages.url = "./packages"; + }; outputs = { self, ... }@inputs: { @@ -20,14 +21,23 @@ homeManagerModule = { config, lib, pkgs, ... }: { imports = [ - inputs.prgms.hmModule + inputs.prgms.hmModule ./services - inputs.packages.hmModule - ./dotfiles + inputs.packages.hmModule +# ./dotfiles + ./impermanence ]; home.stateVersion = "23.11"; + home.file = { + ".config/ags" = { source = ./dotfiles/ags; recursive = true; }; + ".config/hypr" = { source = ./dotfiles/hypr; recursive = true; }; + ".config/swaylock" = { source = ./dotfiles/swaylock; recursive = true; }; + ".config/wal/templates" = { source = ./dotfiles/wal/templates; recursive = true; }; + ".config/wayvnc" = { source = ./dotfiles/wayvnc; recursive = true; }; + "Pictures/Wallpaper" = { source = ./dotfiles/Wallpaper; recursive = true; }; + }; home.username = "nathan"; home.homeDirectory = "/home/nathan"; @@ -50,18 +60,6 @@ programs.ssh.enable = true; - programs.home-manager.enable = true; - }; - - homeConfigurations."nathan" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = import inputs.nixpkgs { - system = "x86_64-linux"; - config.allowUnfree = true; - }; - - imports = [ self.homeManagerModule ]; - }; - }; } diff --git a/home-manager/impermanence/default.nix b/home-manager/impermanence/default.nix new file mode 100644 index 0000000..0c483e1 --- /dev/null +++ b/home-manager/impermanence/default.nix @@ -0,0 +1,21 @@ +{ inputs, ... }: { + + imports = [ + inputs.impermanence.nixosModules.home-manager.impermanence + ]; + + home.persistence."/persist/home/nathan" = { + + directories = [ + "Documents" + "Music" + "Pictures/Photos" + "Projects" + "Videos" + ".ssh" + ]; + files = [ + ]; + allowOther = true; + }; +} diff --git a/home/packages/default.nix b/home-manager/packages/default.nix similarity index 100% rename from home/packages/default.nix rename to home-manager/packages/default.nix diff --git a/home/packages/external/default.nix b/home-manager/packages/external/default.nix similarity index 100% rename from home/packages/external/default.nix rename to home-manager/packages/external/default.nix diff --git a/home/packages/external/flake.nix b/home-manager/packages/external/flake.nix similarity index 100% rename from home/packages/external/flake.nix rename to home-manager/packages/external/flake.nix diff --git a/home/packages/flake.nix b/home-manager/packages/flake.nix similarity index 100% rename from home/packages/flake.nix rename to home-manager/packages/flake.nix diff --git a/home/packages/scripts/default.nix b/home-manager/packages/scripts/default.nix similarity index 98% rename from home/packages/scripts/default.nix rename to home-manager/packages/scripts/default.nix index 95e051b..aabe9f7 100644 --- a/home/packages/scripts/default.nix +++ b/home-manager/packages/scripts/default.nix @@ -75,13 +75,14 @@ '') (pkgs.writeShellScriptBin "onSystemStart" '' + randWallpaper & ags & pypr & - setWallpaper & lxqt-policykit-agent & nmcli device wifi connect EagleNet password '~?C#@ZiH' & hyprctl setcursor Bibata-Modern-Classic 16 & wayvnc & + hyprctl reload & '') (pkgs.writeShellScriptBin "colorPrefix" '' diff --git a/home/packages/scripts/flake.nix b/home-manager/packages/scripts/flake.nix similarity index 100% rename from home/packages/scripts/flake.nix rename to home-manager/packages/scripts/flake.nix diff --git a/home/programs/ags/flake.nix b/home-manager/programs/ags/flake.nix similarity index 100% rename from home/programs/ags/flake.nix rename to home-manager/programs/ags/flake.nix diff --git a/home/programs/calcurse/default.nix b/home-manager/programs/calcurse/default.nix similarity index 100% rename from home/programs/calcurse/default.nix rename to home-manager/programs/calcurse/default.nix diff --git a/home/programs/flake.nix b/home-manager/programs/flake.nix similarity index 82% rename from home/programs/flake.nix rename to home-manager/programs/flake.nix index ff59754..502a7c0 100644 --- a/home/programs/flake.nix +++ b/home-manager/programs/flake.nix @@ -5,9 +5,7 @@ ags.url = "./ags"; - nixvim.url = "/home/nathan/Projects/Nixvim"; - - terminal.url = "./terminal"; #home manager only + nixvim.url = "/ssd1/Projects/Nixvim"; rofi.url = "./rofi"; @@ -23,7 +21,7 @@ imports = [ inputs.ags.hmModule inputs.hyprland.hmModule - inputs.terminal.hmModule + ./terminal inputs.rofi.hmModule inputs.pywal.hmModule ./swaylock diff --git a/home/programs/hyprland/flake.nix b/home-manager/programs/hyprland/flake.nix similarity index 92% rename from home/programs/hyprland/flake.nix rename to home-manager/programs/hyprland/flake.nix index 7c666c3..6903bd1 100644 --- a/home/programs/hyprland/flake.nix +++ b/home-manager/programs/hyprland/flake.nix @@ -31,7 +31,7 @@ systemd.variables = [ "--all" ]; extraConfig = '' - source = ./main.conf + source = /home/nathan/.config/hypr/main.conf ''; }; diff --git a/home/programs/pywal/flake.nix b/home-manager/programs/pywal/flake.nix similarity index 99% rename from home/programs/pywal/flake.nix rename to home-manager/programs/pywal/flake.nix index 63cd753..7987ff5 100644 --- a/home/programs/pywal/flake.nix +++ b/home-manager/programs/pywal/flake.nix @@ -74,6 +74,7 @@ vesktop pkgs-us.pywal16 + imagemagick pywalfox-native ]; diff --git a/home/programs/rofi/default.nix b/home-manager/programs/rofi/default.nix similarity index 100% rename from home/programs/rofi/default.nix rename to home-manager/programs/rofi/default.nix diff --git a/home/programs/rofi/flake.nix b/home-manager/programs/rofi/flake.nix similarity index 100% rename from home/programs/rofi/flake.nix rename to home-manager/programs/rofi/flake.nix diff --git a/home/programs/swaylock/default.nix b/home-manager/programs/swaylock/default.nix similarity index 100% rename from home/programs/swaylock/default.nix rename to home-manager/programs/swaylock/default.nix diff --git a/home/programs/terminal/bat/bat.nix b/home-manager/programs/terminal/bat/default.nix similarity index 100% rename from home/programs/terminal/bat/bat.nix rename to home-manager/programs/terminal/bat/default.nix diff --git a/home-manager/programs/terminal/default.nix b/home-manager/programs/terminal/default.nix new file mode 100644 index 0000000..52de2fc --- /dev/null +++ b/home-manager/programs/terminal/default.nix @@ -0,0 +1,12 @@ +{ ... }: { + + imports = [ + ./bat + ./eza + ./fzf + ./tmux + ./kitty + ./zoxide + ./zsh + ]; +} diff --git a/home/programs/terminal/eza/eza.nix b/home-manager/programs/terminal/eza/default.nix similarity index 100% rename from home/programs/terminal/eza/eza.nix rename to home-manager/programs/terminal/eza/default.nix diff --git a/home/programs/terminal/fzf/fzf.nix b/home-manager/programs/terminal/fzf/default.nix similarity index 100% rename from home/programs/terminal/fzf/fzf.nix rename to home-manager/programs/terminal/fzf/default.nix diff --git a/home/programs/terminal/kitty/kitty.nix b/home-manager/programs/terminal/kitty/default.nix similarity index 100% rename from home/programs/terminal/kitty/kitty.nix rename to home-manager/programs/terminal/kitty/default.nix diff --git a/home/programs/terminal/tmux/tmux.nix b/home-manager/programs/terminal/tmux/default.nix similarity index 100% rename from home/programs/terminal/tmux/tmux.nix rename to home-manager/programs/terminal/tmux/default.nix diff --git a/home/programs/terminal/zoxide/zoxide.nix b/home-manager/programs/terminal/zoxide/default.nix similarity index 100% rename from home/programs/terminal/zoxide/zoxide.nix rename to home-manager/programs/terminal/zoxide/default.nix diff --git a/home/programs/terminal/zsh/zsh.nix b/home-manager/programs/terminal/zsh/default.nix similarity index 100% rename from home/programs/terminal/zsh/zsh.nix rename to home-manager/programs/terminal/zsh/default.nix diff --git a/home/programs/wayvnc/default.nix b/home-manager/programs/wayvnc/default.nix similarity index 51% rename from home/programs/wayvnc/default.nix rename to home-manager/programs/wayvnc/default.nix index 5f84295..e57e85a 100644 --- a/home/programs/wayvnc/default.nix +++ b/home-manager/programs/wayvnc/default.nix @@ -9,14 +9,5 @@ home.packages = with pkgs; [ wayvnc ]; - - home.file.".config/wayvnc/config".text = '' - use_relative_paths=true - address=0.0.0.0 - enable_auth=true - username=nathan - password=//falconAdjacent42 - rsa_private_key_file=rsa_key.pem - ''; }; } diff --git a/home/services/custom/default.nix b/home-manager/services/custom/default.nix similarity index 100% rename from home/services/custom/default.nix rename to home-manager/services/custom/default.nix diff --git a/home/services/default.nix b/home-manager/services/default.nix similarity index 100% rename from home/services/default.nix rename to home-manager/services/default.nix diff --git a/home/services/mpd/default.nix b/home-manager/services/mpd/default.nix similarity index 100% rename from home/services/mpd/default.nix rename to home-manager/services/mpd/default.nix diff --git a/home/dotfiles/default.nix b/home/dotfiles/default.nix deleted file mode 100644 index 762cea3..0000000 --- a/home/dotfiles/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ config, lib, ... }: { - - config = lib.mkMerge [ - - (lib.mkIf config.homeconfig.ags.enable { - home.file = let - dir = "ags"; - in builtins.mapAttrs ( - n: v: { source = v.value; target = v.name; }) ( - builtins.mapAttrs ( - _name: _value: { - name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; - } - ) (builtins.readDir ./${dir}) - ); - - }) - - (lib.mkIf config.homeconfig.hyprland.enable { - home.file = let - dir = "Wallpaper"; - in builtins.mapAttrs ( - n: v: { source = v.value; target = v.name; }) ( - builtins.mapAttrs ( - _name: _value: { - name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; - } - ) (builtins.readDir ./${dir}) - ); - }) - - (lib.mkIf config.homeconfig.hyprland.enable { - home.file = let - dir = "Wallpaper"; - in builtins.mapAttrs ( - n: v: { source = v.value; target = v.name; }) ( - builtins.mapAttrs ( - _name: _value: { - name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; - } - ) (builtins.readDir ./${dir}) - ); - }) - - (lib.mkIf config.homeconfig.swaylock.enable { - home.file = let - dir = "swaylock"; - in builtins.mapAttrs ( - n: v: { source = v.value; target = v.name; }) ( - builtins.mapAttrs ( - _name: _value: { - name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; - } - ) (builtins.readDir ./${dir}) - ); - }) - - (lib.mkIf config.homeconfig.wal.enable { - home.file = let - dir = "wal"; - in builtins.mapAttrs ( - n: v: { source = v.value; target = v.name; }) ( - builtins.mapAttrs ( - _name: _value: { - name = ".config/${dir}/${_name}"; value = ./${dir}/${_name}; - } - ) (builtins.readDir ./${dir}) - ); - }) - ]; -} diff --git a/home/impermanence/default.nix b/home/impermanence/default.nix deleted file mode 100644 index a3850c2..0000000 --- a/home/impermanence/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, self, ... }: { - - imports = [ - self.inputs.impermanence.nixosModules.home-manager.impermanence - ]; - - config = lib.mkIf config.disko.impermanent { - - home.persistence."/persist/home" = { - - directories = [ - "Documents" - "Music" - "Pictures" - "Videos" - ".ssh" - ".config" - ".local" - ".cache/wal" - ]; - files = [ - ".cache/bg" - ".cache/bga" - ]; - allowOther = true; - }; - }; -} diff --git a/home/impermanence/flake.nix b/home/impermanence/flake.nix deleted file mode 100644 index 0d22541..0000000 --- a/home/impermanence/flake.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - description = "nix impermanence home config"; - - inputs.impermanence.url = "github:nix-community/impermanence"; - - outputs = { self, ... }: { - hmModule = import ./. { inherit self; }; - }; - -} diff --git a/home/programs/terminal/bat/flake.nix b/home/programs/terminal/bat/flake.nix deleted file mode 100644 index 6a19005..0000000 --- a/home/programs/terminal/bat/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "bat config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./bat.nix; - - }; -} diff --git a/home/programs/terminal/eza/flake.nix b/home/programs/terminal/eza/flake.nix deleted file mode 100644 index 756b103..0000000 --- a/home/programs/terminal/eza/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "eza config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./eza.nix; - - }; -} diff --git a/home/programs/terminal/flake.nix b/home/programs/terminal/flake.nix deleted file mode 100644 index 373d457..0000000 --- a/home/programs/terminal/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - description = "terminal config"; - - inputs = { - eza.url = "./eza"; - bat.url = "./bat"; - fzf.url = "./fzf"; - zoxide.url = "./zoxide"; - kitty.url = "./kitty"; - tmux.url = "./tmux"; - zsh.url = "./zsh"; - }; - - outputs = { self, ... }@inputs: { - - hmModule = { config, lib, pkgs, ... }: { - imports = [ - inputs.eza.hmModule - inputs.bat.hmModule - inputs.fzf.hmModule - inputs.zoxide.hmModule - inputs.kitty.hmModule - inputs.tmux.hmModule - inputs.zsh.hmModule - ]; - }; - - }; -} diff --git a/home/programs/terminal/fzf/flake.nix b/home/programs/terminal/fzf/flake.nix deleted file mode 100644 index 0ebe49c..0000000 --- a/home/programs/terminal/fzf/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "fzf config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./fzf.nix; - - }; -} diff --git a/home/programs/terminal/kitty/flake.nix b/home/programs/terminal/kitty/flake.nix deleted file mode 100644 index 230cd24..0000000 --- a/home/programs/terminal/kitty/flake.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - description = "Kitty Config"; - - inputs = { - - }; - - outputs = { self, ... }: { - - hmModule = import ./kitty.nix; - - }; -} diff --git a/home/programs/terminal/tmux/flake.nix b/home/programs/terminal/tmux/flake.nix deleted file mode 100644 index 2062bd6..0000000 --- a/home/programs/terminal/tmux/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "Tmux config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./tmux.nix; - - }; -} diff --git a/home/programs/terminal/zoxide/flake.nix b/home/programs/terminal/zoxide/flake.nix deleted file mode 100644 index 5556a2b..0000000 --- a/home/programs/terminal/zoxide/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "Zoxide config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./zoxide.nix; - - }; -} diff --git a/home/programs/terminal/zsh/flake.nix b/home/programs/terminal/zsh/flake.nix deleted file mode 100644 index 5ed40db..0000000 --- a/home/programs/terminal/zsh/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - description = "zsh config"; - - inputs = {}; - - outputs = { self, ... }: { - - hmModule = import ./zsh.nix; - - }; -} diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix new file mode 100644 index 0000000..c249a47 --- /dev/null +++ b/system-config/configuration/homebox/default.nix @@ -0,0 +1,191 @@ +{ config, pkgs, lib, inputs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + + inputs.disko.nixosModules.default + + (import ./disko.nix { device1 = "/dev/nvme0n1"; device2 = "/dev/nvme1n1"; }) + + inputs.impermanence.nixosModules.impermanence + + inputs.home-manager.nixosModules.default + + inputs.system.nixosModule + ]; + + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + + hardware = { + opengl = { + enable = true; + driSupport = true; + extraPackages = with pkgs; [ + nvidia-vaapi-driver + ]; + }; + + nvidia = { + modesetting.enable = true; + open = false; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.beta; + }; + + bluetooth.enable = true; + + pulseaudio.enable = false; + }; + + services = { + xserver = { + enable = true; + videoDrivers = ["nvidia"]; + }; + displayManager.enable = true; + }; + + sysconfig = { + opts = { + sddm.enable = true; + openssh.enable = true; + pipewire.enable = true; + ags.enable = true; + hyprland.enable = true; + git.enable = true; + nh.enable = true; + steam.enable = false; + }; + }; + + environment.sessionVariables = { + WLR_BACKENDS = "headless"; + WLR_LIBINPUT_NO_DEVICES = "1"; + }; + + programs.zsh.enable = true; + environment.shells = with pkgs; [ zsh ]; + users.defaultUserShell = pkgs.zsh; + + nixpkgs.config.allowUnfree = true; + + # Set your time zone. + time.timeZone = "America/Chicago"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + networking = { + hostName = "homebox"; + nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ]; + networkmanager.enable = true; + firewall.allowedTCPPorts = [ 22 ]; + }; + + system.stateVersion = "23.05"; # Did you read the comment? + + users.users."nathan" = { + isNormalUser = true; + initialPassword = "7567"; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop" + ]; + }; + + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + }; + + boot.initrd.postDeviceCommands = lib.mkAfter '' + mkdir /btrfs_tmp + mount /dev/root_vg/root /btrfs_tmp + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi + + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } + + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" + done + + btrfs subvolume create /btrfs_tmp/root + umount /btrfs_tmp + ''; + + fileSystems."/persist".neededForBoot = true; + environment.persistence."/persist/system" = { + hideMounts = true; + directories = [ + "/etc/nixos" + "/var/log" + "/var/lib/bluetooth" + "/var/lib/nixos" + "/var/lib/systemd/coredump" + "/etc/NetworkManager/system-connections" + { directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; } + ]; + files = [ + "/etc/machine-id" + "/etc/ssh/ssh_host_ed25519_key" + "/etc/ssh/ssh_host_ed25519_key.pub" + "/etc/ssh/ssh_host_rsa_key" + "/etc/ssh/ssh_host_rsa_key.pub" + { file = "/var/keys/secret_file"; parentDirectory = { mode = "u=rwx,g=,o="; }; } + ]; + }; + + programs.fuse.userAllowOther = true; + + home-manager = { + backupFileExtension = ".backup"; + extraSpecialArgs = {inherit inputs;}; + users = { + "nathan" = lib.mkMerge [ + inputs.nathan.homeManagerModule + { + config.homeconfig = { + hyprland.enable = true; + swaylock.enable = true; + wal.enable = true; + wayvnc.enable = true; + mpd.enable = true; + ags.enable = true; + calcurse.enable = true; + rofi.enable = true; + }; + } + ]; + }; + }; + + + fonts.packages = with pkgs; [ nerdfonts ]; + +} diff --git a/system-config/configuration/homebox/disko.nix b/system-config/configuration/homebox/disko.nix new file mode 100644 index 0000000..d095d73 --- /dev/null +++ b/system-config/configuration/homebox/disko.nix @@ -0,0 +1,114 @@ +{ + device1 ? throw "Set this to your disk device, e.g. /dev/sda", + device2, + ... +}: { + disko.devices = { + disk = { + main = { + device = device1; + type = "disk"; + content = { + type = "gpt"; + partitions = { + boot = { + name = "boot"; + size = "1M"; + type = "EF02"; + }; + esp = { + name = "ESP"; + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + swap = { + size = "4G"; + content = { + type = "swap"; + resumeDevice = true; + }; + }; + root = { + name = "root"; + size = "100%"; + content = { + type = "lvm_pv"; + vg = "root_vg"; + }; + }; + }; + }; + }; + ssd1 = { + device = device2; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ssd1 = { + name = "ssd1"; + size = "100%"; + content = { + type = "lvm_pv"; + vg = "ssd1_vg"; + }; + }; + }; + }; + }; + }; + lvm_vg = { + root_vg = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%FREE"; + content = { + type = "btrfs"; + extraArgs = ["-f"]; + + subvolumes = { + "/root" = { + mountpoint = "/"; + }; + + "/persist" = { + mountOptions = ["subvol=persist" "noatime"]; + mountpoint = "/persist"; + }; + + "/nix" = { + mountOptions = ["subvol=nix" "noatime"]; + mountpoint = "/nix"; + }; + }; + }; + }; + }; + }; + ssd1_vg = { + type = "lvm_vg"; + lvs = { + ssd1 = { + size = "100%FREE"; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "/ssd1" = { + mountOptions = [ "subvol=ssd1" "noatime" ]; + mountpoint = "/ssd1"; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/system/configuration/homebox/hardware-configuration.nix b/system-config/configuration/homebox/hardware-configuration.nix similarity index 92% rename from system/configuration/homebox/hardware-configuration.nix rename to system-config/configuration/homebox/hardware-configuration.nix index 528ae4a..57d38c7 100644 --- a/system/configuration/homebox/hardware-configuration.nix +++ b/system-config/configuration/homebox/hardware-configuration.nix @@ -8,8 +8,8 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; diff --git a/system/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix similarity index 100% rename from system/configuration/laptop/default.nix rename to system-config/configuration/laptop/default.nix diff --git a/system/configuration/laptop/hardware-configuration.nix b/system-config/configuration/laptop/hardware-configuration.nix similarity index 100% rename from system/configuration/laptop/hardware-configuration.nix rename to system-config/configuration/laptop/hardware-configuration.nix diff --git a/system/configuration/live/flake.nix b/system-config/configuration/live/flake.nix similarity index 100% rename from system/configuration/live/flake.nix rename to system-config/configuration/live/flake.nix diff --git a/system/etc/default.nix b/system-config/etc/default.nix similarity index 100% rename from system/etc/default.nix rename to system-config/etc/default.nix diff --git a/system-config/flake.nix b/system-config/flake.nix new file mode 100755 index 0000000..0bfd49f --- /dev/null +++ b/system-config/flake.nix @@ -0,0 +1,38 @@ +{ + description = "Unified System Configuration"; + + inputs = { + + prgms.url = "./programs"; + + sddm.url = "./services/sddm"; + + }; + + outputs = { self, ... }@attrs: { + + nixosModule = { config, lib, pkgs, inputs, ... }: { + imports = [ + ./services + ./packages + attrs.prgms.module + attrs.sddm.module + ]; + + options = { + sysconfig.opts = { + host = lib.options.mkOption { + type = lib.types.str; + default = null; + }; + username = lib.options.mkOption { + type = lib.types.str; + default = "nathan"; + }; + }; + }; + }; + + }; + +} diff --git a/system-config/packages/default.nix b/system-config/packages/default.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/system-config/packages/default.nix @@ -0,0 +1 @@ +{} diff --git a/system/programs/ags/flake.nix b/system-config/programs/ags/default.nix similarity index 67% rename from system/programs/ags/flake.nix rename to system-config/programs/ags/default.nix index c953726..099f4fc 100644 --- a/system/programs/ags/flake.nix +++ b/system-config/programs/ags/default.nix @@ -1,15 +1,10 @@ -{ - description = "ags dependancies"; +{ config, lib, pkgs, ... }: { - inputs = { + options.sysconfig.opts.ags.enable = lib.options.mkOption { - }; - - outputs = { self, ... }: { - - module = { config, lib, pkgs, ... }: { - - options.sysconfig.opts.ags.enable = lib.options.mkOption {}; + type = lib.types.bool; + default = false; + }; config = lib.mkIf config.sysconfig.opts.ags.enable { services = { @@ -18,7 +13,4 @@ power-profiles-daemon.enable = true; }; }; - }; - - }; } diff --git a/system/programs/flake.nix b/system-config/programs/flake.nix similarity index 85% rename from system/programs/flake.nix rename to system-config/programs/flake.nix index 8f11f3c..e3cf783 100644 --- a/system/programs/flake.nix +++ b/system-config/programs/flake.nix @@ -2,8 +2,6 @@ description = "System program config"; inputs = { - - ags.url = "./ags"; hyprland.url = "./hyprland"; }; @@ -14,7 +12,7 @@ imports = [ inputs.hyprland.module - inputs.ags.module + ./ags ./git ./nh ./steam diff --git a/system/programs/git/default.nix b/system-config/programs/git/default.nix similarity index 100% rename from system/programs/git/default.nix rename to system-config/programs/git/default.nix diff --git a/system/programs/hyprland/flake.nix b/system-config/programs/hyprland/flake.nix similarity index 92% rename from system/programs/hyprland/flake.nix rename to system-config/programs/hyprland/flake.nix index f92b795..a182b48 100644 --- a/system/programs/hyprland/flake.nix +++ b/system-config/programs/hyprland/flake.nix @@ -9,7 +9,11 @@ module = { config, lib, pkgs, ... }: { - options.sysconfig.opts.hyprland.enable = lib.options.mkOption {}; + options.sysconfig.opts.hyprland.enable = lib.options.mkOption { + + type = lib.types.bool; + default = false; + }; config = lib.mkIf config.sysconfig.opts.hyprland.enable { diff --git a/system/programs/nh/default.nix b/system-config/programs/nh/default.nix similarity index 100% rename from system/programs/nh/default.nix rename to system-config/programs/nh/default.nix diff --git a/system/programs/steam/default.nix b/system-config/programs/steam/default.nix similarity index 100% rename from system/programs/steam/default.nix rename to system-config/programs/steam/default.nix diff --git a/system-config/services/default.nix b/system-config/services/default.nix new file mode 100644 index 0000000..4973a8e --- /dev/null +++ b/system-config/services/default.nix @@ -0,0 +1,8 @@ +{ ... }: { + + imports = [ + ./ollama + ./openssh + ./pipewire + ]; +} diff --git a/system/services/ollama/default.nix b/system-config/services/ollama/default.nix similarity index 100% rename from system/services/ollama/default.nix rename to system-config/services/ollama/default.nix diff --git a/system/services/openssh/default.nix b/system-config/services/openssh/default.nix similarity index 100% rename from system/services/openssh/default.nix rename to system-config/services/openssh/default.nix diff --git a/system/services/pipewire/default.nix b/system-config/services/pipewire/default.nix similarity index 100% rename from system/services/pipewire/default.nix rename to system-config/services/pipewire/default.nix diff --git a/system-config/services/sddm/flake.lock b/system-config/services/sddm/flake.lock new file mode 100644 index 0000000..00a813d --- /dev/null +++ b/system-config/services/sddm/flake.lock @@ -0,0 +1,42 @@ +{ + "nodes": { + "repo": { + "flake": false, + "locked": { + "lastModified": 1686823900, + "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", + "type": "github" + }, + "original": { + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "type": "github" + } + }, + "root": { + "inputs": { + "theme": "theme" + } + }, + "theme": { + "inputs": { + "repo": "repo" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-eXmGZXA4mlXGERWWjh2QZCQV8GphWPf+yKt+Fg16OOI=", + "path": "/nix/store/dfaqxn91asadchiwlldsjvjr24jypbd8-source/themes/tokyo-night", + "type": "path" + }, + "original": { + "path": "/nix/store/dfaqxn91asadchiwlldsjvjr24jypbd8-source/themes/tokyo-night", + "type": "path" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/system/services/sddm/flake.nix b/system-config/services/sddm/flake.nix similarity index 100% rename from system/services/sddm/flake.nix rename to system-config/services/sddm/flake.nix diff --git a/system/services/sddm/themes/sugar-dark/flake.nix b/system-config/services/sddm/themes/sugar-dark/flake.nix similarity index 100% rename from system/services/sddm/themes/sugar-dark/flake.nix rename to system-config/services/sddm/themes/sugar-dark/flake.nix diff --git a/system-config/services/sddm/themes/tokyo-night/flake.lock b/system-config/services/sddm/themes/tokyo-night/flake.lock new file mode 100644 index 0000000..7fc9bd4 --- /dev/null +++ b/system-config/services/sddm/themes/tokyo-night/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "repo": { + "flake": false, + "locked": { + "lastModified": 1686823900, + "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", + "type": "github" + }, + "original": { + "owner": "siddrs", + "repo": "tokyo-night-sddm", + "type": "github" + } + }, + "root": { + "inputs": { + "repo": "repo" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/system/services/sddm/themes/tokyo-night/flake.nix b/system-config/services/sddm/themes/tokyo-night/flake.nix similarity index 100% rename from system/services/sddm/themes/tokyo-night/flake.nix rename to system-config/services/sddm/themes/tokyo-night/flake.nix diff --git a/system/configuration/default.nix b/system/configuration/default.nix deleted file mode 100644 index c21c083..0000000 --- a/system/configuration/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, lib, pkgs, core_inputs, ... }: { - - imports = [ - ./laptop - ./homebox - ]; - - sysconfig.laptop.enable = lib.mkDefault false; - sysconfig.homebox.enable = lib.mkDefault false; - - # Set your time zone. - time.timeZone = "America/Chicago"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - -# Define a user account. Don't forget to set a password with ‘passwd’. - users.users.${config.sysconfig.opts.username} = { - isNormalUser = true; - description = "Nathan"; - initialPassword = "7567"; - extraGroups = [ - "networkmanager" - "wheel" - "adbusers" -#school? - "plugdev" - ]; - }; - - - - - networking = { - hostName = config.sysconfig.opts.host; - nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ]; - networkmanager.enable = true; - }; - - - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; - }; - - xdg.portal = { - enable = true; - config.common.default = "*"; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; - }; - - environment.systemPackages = with pkgs; [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - - home-manager - ]; - - fonts.packages = with pkgs; [ nerdfonts ]; -} diff --git a/system/configuration/homebox/default.nix b/system/configuration/homebox/default.nix deleted file mode 100644 index 72da8a6..0000000 --- a/system/configuration/homebox/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, lib, pkgs, ... }: - -{ - - options.sysconfig.homebox.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.sysconfig.homebox.enable { - - nixpkgs.config.allowUnfree = true; - - assertions = [ - { - assertion = !config.sysconfig.laptop.enable; - message = "sysconfig homebox conflicts with laptop"; - } - ]; - - - boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - kernelParams = [ "initcall_blacklist=simpledrm_platform_driver_init" ]; - }; - - hardware = { - opengl = { - enable = true; - driSupport = true; - extraPackages = with pkgs; [ - nvidia-vaapi-driver - ]; - }; - - nvidia = { - modesetting.enable = true; - open = true; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - }; - - bluetooth.enable = true; - - pulseaudio.enable = false; - }; - environment.shells = with pkgs; [ zsh ]; - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; - - sysconfig.opts = { - openssh.enable = true; - pipewire.enable = true; - hyprland.enable = true; - git.enable = true; - ags.enable = true; - nh.enable = true; - steam.enable = false; - }; - - services = { - xserver = { - enable = true; - videoDrivers = [ "nvidia" ]; - }; - - displayManager.enable = true; - }; - - environment = { - sessionVariables = { -# WLR_BACKENDS = "headless"; -# WLR_LIBINPUT_NO_DEVICES = "1"; - }; - }; - - system.stateVersion = "24.05"; - }; -} diff --git a/system/disko/default.nix b/system/disko/default.nix deleted file mode 100644 index 0a83d9f..0000000 --- a/system/disko/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, ... }: { - - options = { - disko = { - enable = lib.options.mkOption { - default = false; - type = lib.types.bool; - }; - impermanent = lib.options.mkOption { - default = false; - type = lib.types.bool; - }; - }; - }; - - imports = [ - ./disko.nix - ./disko_bonus.nix - ./impermanent.nix - ]; - - config = lib.mkIf config.disko.enable (lib.mkMerge [ - - (lib.mkIf (!config.disko.enable) { - disko.impermanent = lib.mkForce false; - }) - ]); -} diff --git a/system/disko/disko.nix b/system/disko/disko.nix deleted file mode 100644 index 335df20..0000000 --- a/system/disko/disko.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ config, lib, ... }: { - - options.sysconfig.opts.devices.main = lib.options.mkOption { - type = lib.types.str; - default = null; - }; - - config = lib.mkIf config.disko.enable { - disko.devices = { - disk.main = { - device = config.sysconfig.opts.devices.main; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - swap = { - size = "4G"; - content = { - type = "swap"; - resumeDevice = true; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "lvm_pv"; - vg = "root_vg"; - }; - }; - }; - }; - }; - - lvm_vg = { - root_vg = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%FREE"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - }; - "/persist" = { - mountOptions = [ "subvol=persist" "noatime" ]; - mountpoint = "/persist"; - }; - "/nix" = { - mountOptions = [ "subvol=nix" "noatime" ]; - mountpoint = "/nix"; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/system/disko/disko_bonus.nix b/system/disko/disko_bonus.nix deleted file mode 100644 index 6e11809..0000000 --- a/system/disko/disko_bonus.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, ... }: { - - options.sysconfig.opts.devices.bonus = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = null; - }; - - config = lib.mkIf (config.disko.enable && config.sysconfig.opts.devices.bonus != null) { - disko.devices = { - disk = builtins.mapAttrs (name: device: { - inherit device; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ${name} = { - name = "${name}"; - size = "100%"; - content = { - type = "lvm_pv"; - vg = "$name_vg"; - }; - }; - }; - }; - }) config.sysconfig.opts.devices.bonus; - - lvm_vg = builtins.mapAttrs (name: device: { - type = "lvm_vg"; - lvs = { - ${name} = { - size = "100%FREE"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/${name}" = { - mountOptions = [ "subvol=${name}" "noatime" ]; - mountpoint = "/${name}"; - }; - }; - }; - }; - }; - }) config.sysconfig.opts.devices.bonus; - }; - }; -} diff --git a/system/disko/flake.nix b/system/disko/flake.nix deleted file mode 100644 index 4d70ae4..0000000 --- a/system/disko/flake.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - description = "disko config"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { self, ... }@inputs: { - - module = { config, lib, pkgs, ... }: { - imports = [ - (import ./default.nix { inherit config lib pkgs; }) - inputs.disko.nixosModules.default - ]; - }; - }; -} diff --git a/system/disko/impermanent.nix b/system/disko/impermanent.nix deleted file mode 100644 index bf07b4d..0000000 --- a/system/disko/impermanent.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, ... }: { - - config = lib.mkIf config.disko.impermanent { - boot.initrd.postDeviceCommands = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/root_vg/root /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%d_%H:%M:%S") - mv /btrfs_tmp/root "btrfs_tmp/old_roots/$timestamp" - fi - - deleteSubvolumeRecursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - deleteSubvolumeRecursively "/btrfs_tmp/$i" - done; - btrfs subvolume delete $1 - } - - for i in $(find /btrfs_tmp/old_roots -maxdepth 1 -mtime +30); do - deleteSubvolumeRecursively "$i" - done - - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - - }; -} diff --git a/system/first_boot/default.nix b/system/first_boot/default.nix deleted file mode 100644 index c48a92a..0000000 --- a/system/first_boot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, core_inputs, ... }: { - - options.sysconfig.opts.firstBoot = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.sysconfig.opts.firstBoot { - - users.users.${config.sysconfig.opts.username} = { - initialPassword = "7567"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop" - ]; - }; - - home-manager.users.${config.sysconfig.opts.username} = core_inputs.${config.sysconfig.opts.username}.homeManagerModule; - - systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; - - systemd.services.onFirstBoot = { - #name = "first-boot.service"; - - description = "actions to perform on the very first boot of the system"; - - enable = true; - - wantedBy = [ "multi-user.target" ]; - - script = '' - setWallpaper /home/nathan/Pictures/Wallpaper/orangescape.jpg 70 - ''; - }; - - sysconfig.opts.openssh.enable = lib.mkForce true; - }; -} diff --git a/system/flake.nix b/system/flake.nix deleted file mode 100755 index b3fde99..0000000 --- a/system/flake.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - description = "Unified System Configuration"; - - inputs = { - - srvcs.url = "./services"; - - pckgs.url = "./packages"; - - prgms.url = "./programs"; - - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - - impermanence.url = "github:nix-community/impermanence"; - - }; - - outputs = { self, ... }@inputs: { - - nixosModule = { config, lib, pkgs, core_inputs, ... }: { - imports = [ - ./configuration -# ./configuration/${core_inputs.host}/hardware-configuration.nix - ./disko - inputs.disko.nixosModules.default - ./impermanence - inputs.impermanence.nixosModules.impermanence - inputs.srvcs.module - inputs.pckgs.module - inputs.prgms.module - ./first_boot - ]; - - options = { - sysconfig.opts = { - host = lib.options.mkOption { - type = lib.types.str; - default = null; - }; - username = lib.options.mkOption { - type = lib.types.str; - default = "nathan"; - }; - }; - }; - - config = { - - assertions = [ - { - assertion = (config.sysconfig.opts.host != null); - message = "host cannot be null"; - } - - { - assertion = (config.sysconfig.opts.devices.main != null); - message = "devices.main cannot be null"; - } - ]; - - networking.hostName = lib.mkDefault config.sysconfig.opts.host; - - #users.users.${config.sysconfig.opts.username} = { - - #}; - }; - }; - - }; - -} diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix deleted file mode 100644 index a4f809e..0000000 --- a/system/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/efe05fe7-563d-411a-954b-317a2e7316f3"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/78F7-FFB8"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix deleted file mode 100644 index 1950bd9..0000000 --- a/system/impermanence/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, ... }: { - - - config = lib.mkIf config.disko.impermanent { - - fileSystems."/persist".neededForBoot = true; - environment.persistence = { - "/persist/system" = { - hideMounts = true; - directories = [ - "/etc/nixos" - "/etc/shadow" - "/var/log" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/systemd/coredump" - "/etc/NetworkManager/system-connections" - ]; - files = [ - "/etc/machine-id" - ]; - }; - }; - - programs.fuse.userAllowOther = true; - }; -} diff --git a/system/impermanence/flake.nix b/system/impermanence/flake.nix deleted file mode 100644 index 0cce1bc..0000000 --- a/system/impermanence/flake.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - description = "nix impermanence config"; - - inputs.impermanence.url = "github:nix-community/impermanence"; - - outputs = { self, ... }: { - - module = { config, lib, ... }: import ./. { inherit config lib self; }; - }; -} diff --git a/system/packages/external/flake.nix b/system/packages/external/flake.nix deleted file mode 100644 index 00893cb..0000000 --- a/system/packages/external/flake.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - description = "System External Flakes"; - - inputs = { - - waveforms.url = "github:liff/waveforms-flake"; - - }; - - outputs = { self, ... }@inputs: { - - module = { config, lib, pkgs, ... }: { - - imports = [ - inputs.waveforms.nixosModule - ]; - - }; - - }; -} diff --git a/system/packages/flake.nix b/system/packages/flake.nix deleted file mode 100644 index efb9a01..0000000 --- a/system/packages/flake.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - description = "System packages"; - - inputs = { - external.url = "./external"; - }; - - outputs = { self, ... }@inputs: { - - module = { config, lib, pkgs, ... }: { - imports = [ - inputs.external.module - ]; - }; - - }; -} diff --git a/system/packages/scripts/flake.nix b/system/packages/scripts/flake.nix deleted file mode 100644 index a5a26e8..0000000 --- a/system/packages/scripts/flake.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - description = "System scripts"; - - inputs = { - }; - - outputs = { self, ... }: { - - module = { config, lib, pkgs, ... }: {}; - - }; -} diff --git a/system/services/flake.nix b/system/services/flake.nix deleted file mode 100644 index cce77ad..0000000 --- a/system/services/flake.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - description = "System service config"; - - inputs = { - - sddm.url = "./sddm"; - }; - - outputs = { self, ... }@inputs: { - - module = { config, lib, pkgs, ... }: { - imports = [ - inputs.sddm.module - ./openssh - ./ollama - ./pipewire - ]; - }; - - }; -}