From 3913013ff8619645a8b3112427689e30f2f2a6c3 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 10 Apr 2025 18:17:13 -0600 Subject: [PATCH 1/9] RIP disko --- flake.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index d04c0b3..dfea2b8 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - disko = { - url = github:nix-community/disko/latest; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; @@ -20,7 +16,7 @@ pinix.url = "github:remi-dupre/pinix"; }; - outputs = inputs@{ self, nixpkgs, disko, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { + outputs = inputs@{ self, nixpkgs, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -72,9 +68,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./garrus.nix ./gnome.nix ./configuration.nix From 783e3d8016f0b2aad89b60cc4a176640f070f549 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 11 Apr 2025 06:59:14 -0600 Subject: [PATCH 2/9] finish removing disko --- flake.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/flake.nix b/flake.nix index dfea2b8..dc403a4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,9 +22,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./gnome.nix ./configuration.nix ./hardware-configuration.nix @@ -35,9 +32,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./gnome.nix ./shepard.nix ./configuration.nix @@ -55,9 +49,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./edi.nix ./configuration.nix ./hardware-configuration.nix @@ -92,9 +83,6 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./pixel-slate.nix ./configuration.nix ]; @@ -104,9 +92,6 @@ system = "aarch64-linux"; specialArgs = { inherit inputs; }; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./drack.nix ./gnome.nix ./configuration.nix @@ -122,9 +107,6 @@ "vm" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - # Add Disko for disk management - disko.nixosModules.disko - ./disko-config.nix ./vm.nix ./configuration.nix ./hardware-configuration.nix From 41f7c79b340ff8476ab3dda81e2dc359119deca8 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 11 Apr 2025 07:16:44 -0600 Subject: [PATCH 3/9] remove COSMIC packages --- hosts/x86_64/garrus/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix index fddca66..ff2bc79 100644 --- a/hosts/x86_64/garrus/configuration.nix +++ b/hosts/x86_64/garrus/configuration.nix @@ -8,14 +8,6 @@ environment.systemPackages = with pkgs; [ system76-keyboard-configurator firmware-manager - - # COSMIC Utils - tweaks - forecast - tasks - calculator - examine - #stellarshot ]; } From d3864b956c608cc72af97f9322ea9bfc10212656 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 11 Apr 2025 07:29:25 -0600 Subject: [PATCH 4/9] set the kernel to latest for garrus --- hosts/x86_64/garrus/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix index ff2bc79..bd95533 100644 --- a/hosts/x86_64/garrus/configuration.nix +++ b/hosts/x86_64/garrus/configuration.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + # Latest kernel needed for best support + boot.kernelPackages = pkgs.linuxPackages_latest; + # Name your host machine networking.hostName = "garrus"; From dfe2aabfd092565171c796ba63188b4b49df321f Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 12 Apr 2025 11:48:50 -0600 Subject: [PATCH 5/9] fix home --- home.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/home.nix b/home.nix index c6adf49..afee102 100644 --- a/home.nix +++ b/home.nix @@ -18,14 +18,9 @@ home.packages = with pkgs; [ deja-dup - #discord #disabled for aarch64 libreoffice-fresh signal-desktop - tuba - #youtube-music #disabled for aarch64 - quickemu - spice-gtk ]; programs.bash = { @@ -71,9 +66,9 @@ "org/gnome/shell" = { favorite-apps = [ "org.gnome.Console.desktop" "nautilus.desktop" "firefox.desktop" "signal-desktop.desktop" ]; }; - "org/gnome/desktop/background" = { - picture-uri-dark = "file:///home/aaronh/Pictures/Walls/wallhaven-2y2wg6.png"; - }; + #"org/gnome/desktop/background" = { + # picture-uri-dark = "file:///home/aaronh/Pictures/Walls/wallhaven-2y2wg6.png"; + #}; "org/gnome/desktop/interface" = { clock-show-seconds = true; clock-show-weekday = true; @@ -83,12 +78,11 @@ "org/gnome/desktop/peripherals/touchpad" = { tap-to-click = true; }; - "org/gnome/desktop/vm/keybindings" = { - close = ["q"]; - }; }; - programs.gh.enable = true; + programs.helix = { + enable = true; + }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; From 95dd1f96ab92766f7afed31aa1e367938c9d5f1d Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 12 Apr 2025 11:49:43 -0600 Subject: [PATCH 6/9] remove nvd --- configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index df3e347..fae6265 100644 --- a/configuration.nix +++ b/configuration.nix @@ -123,13 +123,6 @@ services.hardware.bolt.enable = true; - system.activationScripts.diff = { - supportsDryActivation = true; - text = '' - ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" - ''; - }; - # System system.stateVersion = "24.11"; system.autoUpgrade.enable = true; From 97bdbf101668218a65802c450e935c6298c2da25 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 12 Apr 2025 13:34:07 -0600 Subject: [PATCH 7/9] add zed editor --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index fae6265..a0ae7cd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -78,6 +78,7 @@ # GUI tools firefox + zed-editor # Flake CLI tools inputs.pinix.packages.${system}.default From 8df698b43f99655ed7c35f9448efb27d9224d229 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 19 Apr 2025 17:53:57 -0600 Subject: [PATCH 8/9] fix home-manager to 24.11 release --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index dc403a4..6efb1b0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; From 0e8af9ace2591f0a7286b0ac4893a1e8825bf5b7 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 22 Apr 2025 12:29:49 -0600 Subject: [PATCH 9/9] rebase --- partitions/luks-lvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partitions/luks-lvm.nix b/partitions/luks-lvm.nix index 5b107b9..596dcf1 100644 --- a/partitions/luks-lvm.nix +++ b/partitions/luks-lvm.nix @@ -69,4 +69,4 @@ }; }; }; -} \ No newline at end of file +}