From cf76e1f8c2043ce1a6f58f5dbf69ff7648a67109 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Wed, 8 Apr 2026 11:37:32 +0100 Subject: [PATCH] Switched to quickshell/noctalia as unified shell env --- flake.lock | 94 ++++++++++++++++++++++++++-- flake.nix | 5 ++ home-manager/core/dotfiles | 2 +- home-manager/core/dotfiles.nix | 13 ++++ home-manager/worklaptop/packages.nix | 3 +- home-manager/worklaptop/programs.nix | 9 +-- home-manager/worklaptop/services.nix | 1 - nixos/worklaptop.nix | 12 +--- nixos/worklaptop/packages.nix | 4 -- nixos/worklaptop/services.nix | 2 + 10 files changed, 118 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index a90461e..5648619 100644 --- a/flake.lock +++ b/flake.lock @@ -218,11 +218,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1775305101, - "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "lastModified": 1775525138, + "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", + "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3", "type": "github" }, "original": { @@ -248,12 +248,57 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "noctalia-qs": "noctalia-qs" + }, + "locked": { + "lastModified": 1775637102, + "narHash": "sha256-c0S9RdaaaBuwD802V2kbcId0HwotpTFLeXQvJ3dSyJ4=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "f3ed6d0a2f058ab68ee1b3cd3cc3520df009cadc", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixers-repo": "nixers-repo", "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable_2", + "noctalia": "noctalia", "sops-nix": "sops-nix" } }, @@ -262,11 +307,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1775365543, - "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", + "lastModified": 1775619836, + "narHash": "sha256-VcC/+MMMldwQKcST2y/QTndGLusSxjeUvYwFwzZKKko=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", + "rev": "de5f2d596eb896a5728afcd15f823f59cb9ecfdb", "type": "github" }, "original": { @@ -305,6 +350,43 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "75925962939880974e3ab417879daffcba36c4a3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "walker": { "inputs": { "elephant": [ diff --git a/flake.nix b/flake.nix index 3bc14d3..917503e 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,11 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add sops for secret management sops-nix.url = "github:Mic92/sops-nix"; + # Add Noctalia input + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/home-manager/core/dotfiles b/home-manager/core/dotfiles index a3616d9..a02f4da 160000 --- a/home-manager/core/dotfiles +++ b/home-manager/core/dotfiles @@ -1 +1 @@ -Subproject commit a3616d95e9e271c30d95661fd33dbd402f60b95c +Subproject commit a02f4dabcb08e33c632d62652fecafa6612e59ca diff --git a/home-manager/core/dotfiles.nix b/home-manager/core/dotfiles.nix index fd6193c..e653373 100644 --- a/home-manager/core/dotfiles.nix +++ b/home-manager/core/dotfiles.nix @@ -37,6 +37,19 @@ target = ".config/nvim"; recursive = true; }; + "noctalia" = { + source = lib.cleanSourceWith { + src = ./dotfiles/dot_config/noctalia; + filter = name: type: let + baseName = baseNameOf name; + in + ! ( + (lib.hasPrefix "*/plugins-repo/*" name) + ); + }; + target = ".config/noctalia"; + recursive = true; + }; "pypoetry" = { source = ./dotfiles/dot_config/pypoetry; target = ".config/pypoetry"; diff --git a/home-manager/worklaptop/packages.nix b/home-manager/worklaptop/packages.nix index 288d432..3173f63 100644 --- a/home-manager/worklaptop/packages.nix +++ b/home-manager/worklaptop/packages.nix @@ -16,7 +16,6 @@ in { pkgs.bat-extras.batdiff pkgs.bat-extras.batgrep pkgs.bat-extras.prettybat - pkgs.blueman pkgs.broot pkgs.clapper pkgs.cliphist @@ -29,7 +28,6 @@ in { pkgs.has pkgs.hyperfine pkgs.imagemagick - pkgs.impala pkgs.jujutsu pkgs.kubectl pkgs.lnav @@ -54,6 +52,7 @@ in { nixers.rbw-autofill unstablePkgs.ruff pkgs.signal-desktop + unstablePkgs.spotify pkgs.sshs unstablePkgs.uv pkgs.vial diff --git a/home-manager/worklaptop/programs.nix b/home-manager/worklaptop/programs.nix index b20cabd..6a70a08 100644 --- a/home-manager/worklaptop/programs.nix +++ b/home-manager/worklaptop/programs.nix @@ -8,6 +8,10 @@ nixers, ... }: { + imports = [ + inputs.noctalia.homeModules.default + ]; + programs = { nix-your-shell = { enable = true; @@ -17,10 +21,7 @@ enable = true; enableNushellIntegration = true; }; - waybar = { - enable = true; - systemd.enable = true; - }; + noctalia-shell.enable = true; walker = { enable = true; runAsService = true; diff --git a/home-manager/worklaptop/services.nix b/home-manager/worklaptop/services.nix index 4b7fcf6..c5a9f57 100644 --- a/home-manager/worklaptop/services.nix +++ b/home-manager/worklaptop/services.nix @@ -8,7 +8,6 @@ ... }: { services = { - swaync.enable = true; pueue.enable = true; hyprpaper.enable = true; }; diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix index 97476f4..fc00535 100644 --- a/nixos/worklaptop.nix +++ b/nixos/worklaptop.nix @@ -78,16 +78,10 @@ # Configure networking networking = { hostName = "worklaptop"; # Define your hostname. - networkmanager.enable = false; - wireless.iwd = { + wireless.iwd.enable = true; + networkmanager = { enable = true; - settings = { - General.EnableNetworkConfiguration = true; - Network = { - EnableIPv6 = true; - NameResolvingService = "systemd"; - }; - }; + wifi.backend = "iwd"; }; }; diff --git a/nixos/worklaptop/packages.nix b/nixos/worklaptop/packages.nix index 48c7b65..11c4676 100644 --- a/nixos/worklaptop/packages.nix +++ b/nixos/worklaptop/packages.nix @@ -31,13 +31,9 @@ pkgs.xh unstablePkgs.ghostty unstablePkgs.hyprland - unstablePkgs.hyprlock - unstablePkgs.hyprpaper unstablePkgs.hyprpicker unstablePkgs.hyprshot unstablePkgs.kitty unstablePkgs.libnotify - unstablePkgs.swaynotificationcenter - unstablePkgs.waybar ]; } diff --git a/nixos/worklaptop/services.nix b/nixos/worklaptop/services.nix index fb8cf52..9c8a99b 100644 --- a/nixos/worklaptop/services.nix +++ b/nixos/worklaptop/services.nix @@ -21,6 +21,8 @@ }; }; resolved.enable = true; + upower.enable = true; + tuned.enable = true; pulseaudio.enable = false; pipewire = { enable = true;