diff options
| -rw-r--r-- | docs/home-server.md | 2 | ||||
| -rw-r--r-- | docs/layout.md | 148 | ||||
| -rw-r--r-- | docs/todo.md | 2 | ||||
| -rw-r--r-- | features/user/cli/shells/nushell/default.nix | 2 | ||||
| -rw-r--r-- | features/user/gui/apps/foot.nix | 8 | ||||
| -rwxr-xr-x | features/user/gui/desktops/niri/default.nix | 1 | ||||
| -rw-r--r-- | features/user/gui/desktops/niri/keybinds.nix | 2 | ||||
| -rwxr-xr-x | features/user/gui/desktops/niri/parts/ignis/default.nix | 21 | ||||
| -rw-r--r-- | features/user/gui/desktops/niri/parts/quickshell/.envrc | 1 | ||||
| -rw-r--r-- | features/user/gui/desktops/niri/parts/quickshell/flake.lock | 64 | ||||
| -rw-r--r-- | features/user/gui/desktops/niri/parts/quickshell/flake.nix | 29 | ||||
| -rw-r--r-- | features/user/gui/desktops/niri/parts/selectors.nix | 16 | ||||
| -rw-r--r-- | flake.lock | 213 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | modules/user/aesthetics/themes/oxocarbon/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/custom-neovim/config/init.fnl | 1 | ||||
| -rw-r--r-- | pkgs/custom-neovim/default.nix | 1 | ||||
| -rw-r--r-- | readme.md | 6 | ||||
| -rw-r--r-- | users/ideapad-laptop/lucas.nix | 1 |
19 files changed, 298 insertions, 229 deletions
diff --git a/docs/home-server.md b/docs/home-server.md index fd2de2c..0997eb7 100644 --- a/docs/home-server.md +++ b/docs/home-server.md @@ -1,3 +1,5 @@ +[back](../readme.md) + # Home Server ## Programs: diff --git a/docs/layout.md b/docs/layout.md index 53370cf..c52b288 100644 --- a/docs/layout.md +++ b/docs/layout.md @@ -1,76 +1,76 @@ -# Layout +[back](../readme.md) -I have no idea why codeberg shows this without any newlines. +# Layout -features/: Simple reusable configurations (only create an enable option and maybe one other). - system/ - gui/: Graphical configurations. - desktops/: Desktop environments, compositors, window managers, etc. - apps/: Graphical apps. - bundles/: Collections of gui configurations. - cli/: Commandline configurations. - scripts/: Custom scripts. - apps/: Commandline apps (TUIs). - utils/: Commandline utils. - shells/: Shell configurations. - bundles/: Collections of cli configs. - services/: Service configurations. - core/: Highest importance services. - extra/: Medium importance services. - misc/: Miscellaneous services. - hardware/: Hardware services. - bundles: Collections of service configs. - global/: Always enabled on every device. - server/: Server configurations. - core/: Core server configs (e.g. SSH, Backups, system monitoring). - media/: Server apps for managing media (books, videos, etc) (e.g. Calibre or Invidious). - cloud/: Server apps for file storage (e.g. Syncthing, Nextcloud). - development/: Server apps to assist in development (e.g. Git server setup). - gaming/: Game servers (e.g. Minecraft). - user/ - gui/: Graphical configurations. - desktops/ - apps/ - bundles/ - cli/ - scripts/ - apps/ - utils/ - bundles/ - services/ - global/ - home-manager.nix -modules/: Custom nix modules (Can create any amount of options). - system/: Custom nixos modules. - user/: Custom home-manager modules. - aesthetics/ - default.nix - targets/ - themes/ -secrets/: Age-encrypted secrets integrated with nixos. - user-passwords/ - culsans.age - lucas.age - server.age -users/: User specific home manager configurations - nzxt-desktop/ - culsans.nix - ideapad-laptop/ - lucas.nix - prodesk-server/ - server.nix - pendrive-iso/ - pendrive.nix -systems/: System-specific nixos configurations. - nzxt-desktop/ - system.nix - hardware.nix - ideapad-laptop/ - system.nix - hardware.nix - prodesk-server/ - system.nix - hardware.nix - pendrive-iso/ - system.nix - hardware.nix +- features/: Simple reusable configurations (only create an enable option and maybe one other). + - system/ + - gui/: Graphical configurations. + - desktops/: Desktop environments, compositors, window managers, etc. + - apps/: Graphical apps. + - bundles/: Collections of gui configurations. + - cli/: Commandline configurations. + - scripts/: Custom scripts. + - apps/: Commandline apps (TUIs). + - utils/: Commandline utils. + - shells/: Shell configurations. + - bundles/: Collections of cli configs. + - services/: Service configurations. + - core/: Highest importance services. + - extra/: Medium importance services. + - misc/: Miscellaneous services. + - hardware/: Hardware services. + - bundles: Collections of service configs. + - global/: Always enabled on every device. + - server/: Server configurations. + - core/: Core server configs (e.g. SSH, Backups, system monitoring). + - media/: Server apps for managing media (books, videos, etc) (e.g. Calibre or Invidious). + - cloud/: Server apps for file storage (e.g. Syncthing, Nextcloud). + - development/: Server apps to assist in development (e.g. Git server setup). + - gaming/: Game servers (e.g. Minecraft). + - user/ + - gui/: Graphical configurations. + - desktops/ + - apps/ + - bundles/ + - cli/ + - scripts/ + - apps/ + - utils/ + - bundles/ + - services/ + - global/ + - home-manager.nix +- modules/: Custom nix modules (Can create any amount of options). + - system/: Custom nixos modules. + - user/: Custom home-manager modules. + - aesthetics/ + - default.nix + - targets/ + - themes/ +- secrets/: Age-encrypted secrets integrated with nixos. + - user-passwords/ + - culsans.age + - lucas.age + - server.age +- users/: User specific home manager configurations + - nzxt-desktop/ + - culsans.nix + - ideapad-laptop/ + - lucas.nix + - prodesk-server/ + - server.nix + - pendrive-iso/ + - pendrive.nix +- systems/: System-specific nixos configurations. + - nzxt-desktop/ + - system.nix + - hardware.nix + - ideapad-laptop/ + - system.nix + - hardware.nix + - prodesk-server/ + - system.nix + - hardware.nix + - pendrive-iso/ + - system.nix + - hardware.nix diff --git a/docs/todo.md b/docs/todo.md index 765e544..3c96fa7 100644 --- a/docs/todo.md +++ b/docs/todo.md @@ -1,3 +1,5 @@ +[back](../readme.md) + # Setup ## Todo diff --git a/features/user/cli/shells/nushell/default.nix b/features/user/cli/shells/nushell/default.nix index b8abba5..988308c 100644 --- a/features/user/cli/shells/nushell/default.nix +++ b/features/user/cli/shells/nushell/default.nix @@ -68,7 +68,7 @@ in { let template_path = "${./direnv-project-template}" | path expand let template_files = ls -a $template_path | get name $template_files | each {|item| cp $item $path} - ls -a $path | get name | filter {|name| $template_files | str contains ($name | path basename) | any {}} | each {|name| chmod +w $name} + ls -a $path | get name | where {|name| $template_files | str contains ($name | path basename) | any {}} | each {|name| chmod +w $name} if (try {git rev-parse --is-inside-work-tree e> /dev/null}) != null { direnv allow } else { diff --git a/features/user/gui/apps/foot.nix b/features/user/gui/apps/foot.nix index d099e16..321e7e8 100644 --- a/features/user/gui/apps/foot.nix +++ b/features/user/gui/apps/foot.nix @@ -1,11 +1,15 @@ -{ config, pkgs, lib, ... }: let +{ + config, + pkgs, + lib, + ... +}: let cfg = config.features.gui.apps.foot; in { options.features.gui.apps.foot.enable = lib.mkEnableOption "foot"; config = lib.mkIf cfg.enable { programs.foot = { enable = true; - server.enable = true; settings = { main.pad = "0x4"; }; diff --git a/features/user/gui/desktops/niri/default.nix b/features/user/gui/desktops/niri/default.nix index cd904de..6304c66 100755 --- a/features/user/gui/desktops/niri/default.nix +++ b/features/user/gui/desktops/niri/default.nix @@ -20,7 +20,6 @@ in { selectors.enable = true; swww.enable = true; mako.enable = true; - ignis.enable = true; hyprlock.enable = true; }; programs.niri = { diff --git a/features/user/gui/desktops/niri/keybinds.nix b/features/user/gui/desktops/niri/keybinds.nix index 5426ee6..c9b0245 100644 --- a/features/user/gui/desktops/niri/keybinds.nix +++ b/features/user/gui/desktops/niri/keybinds.nix @@ -12,7 +12,7 @@ right = "l"; in { # App Launching Keys - "Mod+Q".action.spawn = ["footclient"]; + "Mod+Q".action.spawn = ["foot"]; "Mod+W".action.spawn = ["qutebrowser"]; "Mod+Shift+W".action.spawn = ["librewolf"]; "Mod+E".action.spawn = ["neovide"]; diff --git a/features/user/gui/desktops/niri/parts/ignis/default.nix b/features/user/gui/desktops/niri/parts/ignis/default.nix deleted file mode 100755 index c609ca9..0000000 --- a/features/user/gui/desktops/niri/parts/ignis/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: let - cfg = config.features.gui.desktops.niri.parts.ignis; -in { - options.features.gui.desktops.niri.parts.ignis.enable = lib.mkEnableOption "ignis"; - config = lib.mkIf cfg.enable { - home.packages = [ - inputs.ignis.packages.${pkgs.system}.ignis - pkgs.python3 - ]; - # home.file."ignis-config" = { - # target = ".config/ignis/config.py"; - # src = ./config.py; - # }; - # home.file."ignis-style" = { - # target = ".config/ignis/style.scss"; - # text = /*scss*/ '' - - # ''; - # }; - }; -} diff --git a/features/user/gui/desktops/niri/parts/quickshell/.envrc b/features/user/gui/desktops/niri/parts/quickshell/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/features/user/gui/desktops/niri/parts/quickshell/.envrc @@ -0,0 +1 @@ +use flake diff --git a/features/user/gui/desktops/niri/parts/quickshell/flake.lock b/features/user/gui/desktops/niri/parts/quickshell/flake.lock new file mode 100644 index 0000000..29f5851 --- /dev/null +++ b/features/user/gui/desktops/niri/parts/quickshell/flake.lock @@ -0,0 +1,64 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1751498133, + "narHash": "sha256-QWJ+NQbMU+NcU2xiyo7SNox1fAuwksGlQhpzBl76g1I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d55716bb59b91ae9d1ced4b1ccdea7a442ecbfdb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/features/user/gui/desktops/niri/parts/quickshell/flake.nix b/features/user/gui/desktops/niri/parts/quickshell/flake.nix new file mode 100644 index 0000000..2122f1f --- /dev/null +++ b/features/user/gui/desktops/niri/parts/quickshell/flake.nix @@ -0,0 +1,29 @@ +{ + description = "Project flake"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + systems.url = "github:nix-systems/default"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "systems"; + }; + }; + + outputs = { + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + devShells.default = pkgs.mkShell { + packages = with pkgs; [ + quickshell + ]; + }; + } + ); +} diff --git a/features/user/gui/desktops/niri/parts/selectors.nix b/features/user/gui/desktops/niri/parts/selectors.nix index 6550a9f..1adc917 100644 --- a/features/user/gui/desktops/niri/parts/selectors.nix +++ b/features/user/gui/desktops/niri/parts/selectors.nix @@ -22,20 +22,20 @@ in { let tools = { "rebuild nixos": { # footclient -H sudo nixos-rebuild switch --flake ($"~/Sync/setup#(hostname)" | path expand) - footclient -H nh os switch + foot -H nh os switch } "rebuild home": { - # footclient -H home-manager switch --flake ($"~/Sync/setup#(whoami)@(hostname)" | path expand) - footclient -H nh home switch + # foot -H home-manager switch --flake ($"~/Sync/setup#(whoami)@(hostname)" | path expand) + foot -H nh home switch } "update flake": { - footclient -H nix flake update --flake ($"~/Sync/setup/" | path expand) + foot -H nix flake update --flake ($"~/Sync/setup/" | path expand) } "manage wifi": { - footclient ${pkgs.impala}/bin/impala + foot ${pkgs.impala}/bin/impala } "manage bluetooth": { - footclient ${lib.getExe pkgs.bluetui} + foot ${lib.getExe pkgs.bluetui} } "create qr-code": { let temp_file = mktemp @@ -44,6 +44,10 @@ in { $qr_code_bin | save -f $temp_file ${lib.getExe pkgs.imv} $temp_file } + "steam big-picture": { + rm -r ~/.steam + gamescope -f --backend sdl -- steam -bigpicture + } } # Logic @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -61,10 +61,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "ignis", - "systems" - ] + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -82,7 +79,10 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": [ + "wallpapers", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -98,22 +98,6 @@ "type": "github" } }, - "gvc": { - "flake": false, - "locked": { - "lastModified": 1735384240, - "narHash": "sha256-ikF9EzFlsRH8i4+SVUHETF4Jk1ob2JX1RLsuMdzrQOQ=", - "owner": "linkfrg", - "repo": "libgnome-volume-control-wheel", - "rev": "2d1cb33dacdae43127bb843a48b159ea7b8925d0", - "type": "github" - }, - "original": { - "owner": "linkfrg", - "repo": "libgnome-volume-control-wheel", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -142,11 +126,11 @@ ] }, "locked": { - "lastModified": 1747875884, - "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", + "lastModified": 1752402455, + "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", + "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df", "type": "github" }, "original": { @@ -156,38 +140,17 @@ "type": "github" } }, - "ignis": { - "inputs": { - "flake-utils": "flake-utils", - "gvc": "gvc", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1747852781, - "narHash": "sha256-hHnkGFbn0AokiSzm5iIx9JQT1LUHo1eKSz/ZD/NKMoE=", - "owner": "linkfrg", - "repo": "ignis", - "rev": "8a49ce83889dc9ceeea4a371130a824dd6ec0e3b", - "type": "github" - }, - "original": { - "owner": "linkfrg", - "repo": "ignis", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749153760, - "narHash": "sha256-qjrMYNddCEKQPITJnvkU9MGLElDxVu60cnDhqn+pbOA=", + "lastModified": 1752340638, + "narHash": "sha256-9+vBdRt/jg8fAll1VD3NXBibkRq9F8Wq/mW45I5jlvc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f029d7a809fb0defb621992bca78ae90ed617a64", + "rev": "1129c951dcc2a269a12cb74d64bd64e44e724ecb", "type": "github" }, "original": { @@ -198,11 +161,11 @@ }, "mnw": { "locked": { - "lastModified": 1747615842, - "narHash": "sha256-pAh9ndf+GdoCfsWaNATFDjgiax9fOYdWzguYV1H/W0E=", + "lastModified": 1748710831, + "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "owner": "Gerg-L", "repo": "mnw", - "rev": "b62120999410eb4a4e27359a3e1c0a22fcc0baff", + "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "type": "github" }, "original": { @@ -215,17 +178,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747929338, - "narHash": "sha256-qGMrtBvWWKPElGpQ4ZPZVGN8HLC+laJHkwcsJB7wwGs=", + "lastModified": 1752421961, + "narHash": "sha256-9uTU9mZO3SOSKgn/Qz4RVJqwsoNpM1Bx2e7bNfHALs0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5b5c0cc698a19c5a10ef1aee487cae238a4aac1e", + "rev": "c97425d44edb8879e8c4a3d1991e4442c03395ea", "type": "github" }, "original": { @@ -237,16 +200,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.02", + "ref": "v25.05.1", "repo": "niri", "type": "github" } @@ -254,11 +217,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747926317, - "narHash": "sha256-EBGfaeZ53SNBtsB8dnvBWfjwp+dRDCEkfYyRfwTdbls=", + "lastModified": 1752418007, + "narHash": "sha256-3DyujBgCewh7r5fz4L0ZRw28BJBqfqeDSVpeTud/aEU=", "owner": "YaLTeR", "repo": "niri", - "rev": "8347cc20dc87049b398ab655565d468c5c4427a0", + "rev": "bb40a35ccf6edbe2c838686562cbdad1ef98ce72", "type": "github" }, "original": { @@ -269,11 +232,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1744659587, - "narHash": "sha256-xJnbmRVte13akgn+Prg06IaRHJ5OX3uVltwsCP/mxoc=", + "lastModified": 1751276396, + "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "928d868a9141b48f152d3b2b00c433e688d4b106", + "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74", "type": "github" }, "original": { @@ -307,15 +270,15 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1747879379, - "narHash": "sha256-P75zsT/obKvvBO1Wmf+KIzt/vIzOpldUdLFCsmfB75Q=", + "lastModified": 1752373696, + "narHash": "sha256-xdjUzHG3sPAs3U1wVnx5hf1NrspCN+qtaBmAks+wnsM=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "cac1326c98b69b36e5aa3fae21fa4bb0eba23988", + "rev": "93ca1ac26dc85d8c34f838a5afb7138ff445d2bc", "type": "github" }, "original": { @@ -342,27 +305,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1752162966, + "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -374,11 +337,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -390,15 +353,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", - "owner": "NixOS", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -406,11 +369,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -422,16 +385,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", - "owner": "nixos", + "lastModified": 1752012998, + "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "2a2130494ad647f953593c4e84ea4df839fbd68c", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -440,13 +403,13 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", - "ignis": "ignis", "jovian": "jovian", "mnw": "mnw", "niri": "niri", "nix-flatpak": "nix-flatpak", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5", + "wallpapers": "wallpapers" } }, "systems": { @@ -466,16 +429,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -494,19 +457,39 @@ "type": "github" } }, + "wallpapers": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1752422995, + "narHash": "sha256-apmJxIDB5pU9FO1xO1XubC4cBtCIAXvFW9ICxE0LlMY=", + "ref": "refs/heads/main", + "rev": "c2da1256487750dab335c68bc5099d8b5c3e2115", + "revCount": 5, + "type": "git", + "url": "https://codeberg.org/triethyl/wallpapers" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/triethyl/wallpapers" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5.1", + "ref": "v0.6", "repo": "xwayland-satellite", "type": "github" } @@ -514,11 +497,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1747111562, - "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", + "lastModified": 1752338000, + "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", + "rev": "ba78881a68182ce338041846164cbfed0d70935c", "type": "github" }, "original": { @@ -40,14 +40,14 @@ # Nonessential + wallpapers.url = "git+https://codeberg.org/triethyl/wallpapers"; + mnw.url = "github:Gerg-L/mnw"; niri.url = "github:sodiboo/niri-flake"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - ignis.url = "github:linkfrg/ignis"; - nix-flatpak.url = "github:gmodena/nix-flatpak"; }; } diff --git a/modules/user/aesthetics/themes/oxocarbon/default.nix b/modules/user/aesthetics/themes/oxocarbon/default.nix index c568c97..2c6ee6e 100644 --- a/modules/user/aesthetics/themes/oxocarbon/default.nix +++ b/modules/user/aesthetics/themes/oxocarbon/default.nix @@ -6,14 +6,15 @@ ... }: let cfg = config.aesthetics.themes.oxocarbon; + wallpapers = inputs.wallpapers.packages.${pkgs.system}.default; in { options.aesthetics.themes.oxocarbon.enable = lib.mkEnableOption "oxocarbon theme"; config = lib.mkMerge [ ( lib.mkIf cfg.enable { aesthetics = { - wallpaper = ./wallpapers/landscape/salt-flats.jpg; - wallpapersDir = ./wallpapers; + wallpaper = "${wallpapers}/neutral/landscape/salt-flats.jpg"; + wallpapersDir = "${wallpapers}/neutral"; scheme = { base00 = "161616"; base01 = "262626"; diff --git a/pkgs/custom-neovim/config/init.fnl b/pkgs/custom-neovim/config/init.fnl new file mode 100644 index 0000000..f9a303f --- /dev/null +++ b/pkgs/custom-neovim/config/init.fnl @@ -0,0 +1 @@ +(vim.cmd.colorscheme oxocarbon) diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 7c63e5f..20c32e1 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -23,7 +23,6 @@ in inputs.mnw.lib.wrap pkgs { neovim = pkgs.neovim-unwrapped; - plugins = with pkgs.vimPlugins; { dev.config = { pure = ./config; @@ -1,12 +1,12 @@ +> [!WARNING] +> I am an amateur at nix and programming in general, please assume that this code is inefficient and unprofessional. + Welcome to my Nix* setup! Iteration: 7? This repo contains multi-device configurations for nixos and home-manager, including features like agenix for secret management, a wrapped neovim package with mnw, and more. -> [!WARNING] -> I am an amateur at nix and programming in general, please assume that this code is inefficient and unprofessional. - > [!CAUTION] > The following documents are likely outdated and do not reflect the actual state of this repo. diff --git a/users/ideapad-laptop/lucas.nix b/users/ideapad-laptop/lucas.nix index a8c5832..e5caa58 100644 --- a/users/ideapad-laptop/lucas.nix +++ b/users/ideapad-laptop/lucas.nix @@ -40,6 +40,7 @@ btop.enable = true; helix.enable = true; zellij.enable = true; + lazygit.enable = true; }; utils = { git.enable = true; |