From 00cf2c38f972e538e840d70f68a5028134268330 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 12 Apr 2025 18:51:28 +0200 Subject: [PATCH] :sparkles: Pass hostName in args, fix Hyprpanel theming, removed unused flake and overlay --- flake.nix | 83 ++++++++++--------- hosts/desktop/default.nix | 2 +- hosts/desktop/flake.nix | 74 ----------------- .../hyprland/hyprpanel/default.nix | 10 ++- hosts/desktop/modules/networking.nix | 4 +- hosts/desktop/overlays.nix | 7 -- shared/common.nix | 2 - 7 files changed, 55 insertions(+), 127 deletions(-) delete mode 100644 hosts/desktop/flake.nix delete mode 100644 hosts/desktop/overlays.nix diff --git a/flake.nix b/flake.nix index d83ab2d..b37c184 100644 --- a/flake.nix +++ b/flake.nix @@ -89,46 +89,51 @@ # # ========= Host Configurations ========= # - nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - outputs - inputs - common - theme - lib - ; - isDarwin = false; - }; - modules = [ - ./hosts/desktop - home-manager.nixosModules.home-manager - { - home-manager = { - # Backups conflicting files in case of error - backupFileExtension = "bkp"; - useGlobalPkgs = true; - useUserPackages = true; - # Passes inputs as an argument to home-manager - extraSpecialArgs = { - inherit - inputs - common - theme - libHm - ; + nixosConfigurations.desktop = + let + hostName = "desktop"; + in + nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit + outputs + inputs + common + theme + lib + hostName + ; + isDarwin = false; + }; + modules = [ + ./hosts/desktop + home-manager.nixosModules.home-manager + { + home-manager = { + # Backups conflicting files in case of error + backupFileExtension = "bkp"; + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit + inputs + common + theme + libHm + hostName + ; + }; + users.${common.username} = import ./hosts/${hostName}/home-manager; }; - users.${common.username} = import ./hosts/desktop/home-manager; - }; - } - { - nixpkgs.overlays = with inputs; [ - hyprpanel.overlay - ]; - } - ]; - }; + } + { + nixpkgs.overlays = with inputs; [ + hyprpanel.overlay + ]; + } + ]; + }; # # ========= Formatting ========= diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 73c5636..ef3c46f 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -51,7 +51,7 @@ vlc vdhcoapp # TODO run "vdhcoapp install" on startup onlyoffice-desktopeditors - inputs.grayjay.packages.${pkgs.system}.grayjay + inputs.grayjay.packages.${system}.grayjay ]; nix.settings.experimental-features = [ diff --git a/hosts/desktop/flake.nix b/hosts/desktop/flake.nix deleted file mode 100644 index 869ed37..0000000 --- a/hosts/desktop/flake.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - description = "NixOS configuration"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - - home-manager = { - url = "github:nix-community/home-manager/release-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - }; - - outputs = - inputs@{ - self, - nixpkgs, - nixpkgs-unstable, - home-manager, - ... - }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - inherit (self) outputs; - common = import ./common.nix; - theme = import ../shared/theme.nix; - in - { - defaultPackage.${system} = home-manager.defaultPackage.${system}; - - # Adds the nix fmt command to format nix files - formatter.${system} = pkgs.nixfmt-rfc-style; - - nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem { - system = system; - specialArgs = { - inherit - outputs - inputs - common - theme - ; - }; # Pass args to modules - modules = [ - ./configuration.nix - home-manager.nixosModules.home-manager - { - home-manager = { - # Backups conflicting files in case of error - backupFileExtension = "bkp"; - useGlobalPkgs = true; - useUserPackages = true; - # Passes inputs as an argument to home-manager - extraSpecialArgs = { inherit inputs common theme; }; - users.${common.username} = import ./home-manager; - }; - } - ./overlays.nix - ]; - }; - - overlays = { - # Gives access to unstable packages everywhere - unstable-packages = final: _prev: { - unstable = import nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; - }; - }; -} diff --git a/hosts/desktop/home-manager/hyprland/hyprpanel/default.nix b/hosts/desktop/home-manager/hyprland/hyprpanel/default.nix index 33dd320..08add4a 100644 --- a/hosts/desktop/home-manager/hyprland/hyprpanel/default.nix +++ b/hosts/desktop/home-manager/hyprland/hyprpanel/default.nix @@ -19,9 +19,15 @@ # Override the final config with an arbitrary set. # Useful for overriding colors in your selected theme. - # Default: {} + # TODO fixes theming bugs in recent versions, should be removed when fixed override = { - theme.bar.menus.text = "#123ABC"; + theme = { + bar.transparent = true; + font = { + name = "${theme.nerdFont} NF"; + size = "15px"; + }; + }; }; # Configure and theme almost all options from the GUI. diff --git a/hosts/desktop/modules/networking.nix b/hosts/desktop/modules/networking.nix index f883c5a..cafa9fc 100644 --- a/hosts/desktop/modules/networking.nix +++ b/hosts/desktop/modules/networking.nix @@ -1,9 +1,9 @@ -{ common, ... }: +{ hostName, ... }: { networking = { networkmanager.enable = true; - hostName = common.hostname; + inherit hostName; # wireless.enable = true; # Enables wireless support via wpa_supplicant. }; diff --git a/hosts/desktop/overlays.nix b/hosts/desktop/overlays.nix deleted file mode 100644 index b41909f..0000000 --- a/hosts/desktop/overlays.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ inputs, ... }: - -{ - nixpkgs.overlays = with inputs; [ - hyprpanel.overlay - ]; -} diff --git a/shared/common.nix b/shared/common.nix index 86aaf2e..519a3c4 100644 --- a/shared/common.nix +++ b/shared/common.nix @@ -13,8 +13,6 @@ rec { pictures = "${dir.home}/Pictures"; }; - hostname = "desktop"; - keymaps = { layout = "gb,no"; options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT