removed zen-browser flake, moved stuff out of configuration.nix, new gnome module

+1
.gitignore
··· 1 + result
-23
configuration.nix
··· 3 3 ... 4 4 }: 5 5 { 6 - boot = { 7 - loader = { 8 - systemd-boot = { 9 - enable = true; 10 - configurationLimit = 10; 11 - }; 12 - efi.canTouchEfiVariables = true; 13 - }; 14 - kernelPackages = pkgs.linuxPackages_latest; 15 - }; 16 - 17 - services.displayManager.gdm.enable = true; 18 - services.desktopManager = { 19 - gnome.enable = true; 20 - }; 21 - 22 - environment.gnome.excludePackages = with pkgs; [ 23 - epiphany 24 - simple-scan 25 - gnome-console 26 - ]; 27 - 28 6 networking.hostName = "bobcat"; 29 7 networking.networkmanager.enable = true; 30 8 ··· 52 30 }; 53 31 }; 54 32 55 - zramSwap.enable = true; 56 33 }
+1 -58
flake.lock
··· 158 158 "type": "github" 159 159 } 160 160 }, 161 - "home-manager_2": { 162 - "inputs": { 163 - "nixpkgs": [ 164 - "zen-browser", 165 - "nixpkgs" 166 - ] 167 - }, 168 - "locked": { 169 - "lastModified": 1752603129, 170 - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", 171 - "owner": "nix-community", 172 - "repo": "home-manager", 173 - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", 174 - "type": "github" 175 - }, 176 - "original": { 177 - "owner": "nix-community", 178 - "repo": "home-manager", 179 - "type": "github" 180 - } 181 - }, 182 161 "nixos-hardware": { 183 162 "locked": { 184 163 "lastModified": 1760106635, ··· 211 190 "type": "github" 212 191 } 213 192 }, 214 - "nixpkgs_2": { 215 - "locked": { 216 - "lastModified": 1755615617, 217 - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", 218 - "owner": "nixos", 219 - "repo": "nixpkgs", 220 - "rev": "20075955deac2583bb12f07151c2df830ef346b4", 221 - "type": "github" 222 - }, 223 - "original": { 224 - "owner": "nixos", 225 - "ref": "nixos-unstable", 226 - "repo": "nixpkgs", 227 - "type": "github" 228 - } 229 - }, 230 193 "nur": { 231 194 "inputs": { 232 195 "flake-parts": [ ··· 257 220 "home-manager": "home-manager", 258 221 "nixos-hardware": "nixos-hardware", 259 222 "nixpkgs": "nixpkgs", 260 - "stylix": "stylix", 261 - "zen-browser": "zen-browser" 223 + "stylix": "stylix" 262 224 } 263 225 }, 264 226 "stylix": { ··· 388 350 "original": { 389 351 "owner": "tinted-theming", 390 352 "repo": "base16-zed", 391 - "type": "github" 392 - } 393 - }, 394 - "zen-browser": { 395 - "inputs": { 396 - "home-manager": "home-manager_2", 397 - "nixpkgs": "nixpkgs_2" 398 - }, 399 - "locked": { 400 - "lastModified": 1760818795, 401 - "narHash": "sha256-dOpzApjgTFlBTWmb1AFtV2W41H1xpNzEMD2OHVMs6rM=", 402 - "owner": "0xc000022070", 403 - "repo": "zen-browser-flake", 404 - "rev": "b121d5d8212364b90757fd17d9c75c50f9e824da", 405 - "type": "github" 406 - }, 407 - "original": { 408 - "owner": "0xc000022070", 409 - "repo": "zen-browser-flake", 410 353 "type": "github" 411 354 } 412 355 }
+4 -3
flake.nix
··· 13 13 inputs = { 14 14 nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 15 15 nixos-hardware.url = "github:NixOS/nixos-hardware/master"; 16 - zen-browser.url = "github:0xc000022070/zen-browser-flake"; 17 - home-manager.url = "github:nix-community/home-manager"; 18 - home-manager.inputs.nixpkgs.follows = "nixpkgs"; 16 + home-manager = { 17 + url = "github:nix-community/home-manager"; 18 + inputs.nixpkgs.follows = "nixpkgs"; 19 + }; 19 20 stylix = { 20 21 url = "github:nix-community/stylix"; 21 22 inputs.nixpkgs.follows = "nixpkgs";
+26 -12
hosts/bobcat/hardware-configuration.nix
··· 1 - # Do not modify this file! It was generated by ‘nixos-generate-config’ 2 - # and may be overwritten by future invocations. Please make changes 3 - # to /etc/nixos/configuration.nix instead. 4 1 { 5 2 config, 6 3 lib, ··· 14 11 (modulesPath + "/installer/scan/not-detected.nix") 15 12 ]; 16 13 17 - boot.initrd.availableKernelModules = [ 18 - "xhci_pci" 19 - "ahci" 20 - "usb_storage" 21 - "sd_mod" 22 - ]; 23 - boot.initrd.kernelModules = [ ]; 24 - boot.kernelModules = [ "kvm-intel" ]; 25 - boot.extraModulePackages = [ ]; 14 + boot = { 15 + initrd = { 16 + availableKernelModules = [ 17 + "xhci_pci" 18 + "ahci" 19 + "usb_storage" 20 + "sd_mod" 21 + ]; 22 + kernelModules = [ ]; 23 + }; 24 + 25 + kernelModules = [ "kvm-intel" ]; 26 + 27 + extraModulePackages = [ ]; 28 + 29 + loader = { 30 + systemd-boot = { 31 + enable = true; 32 + configurationLimit = 10; 33 + }; 34 + efi.canTouchEfiVariables = true; 35 + }; 36 + kernelPackages = pkgs.linuxPackages_latest; 37 + }; 26 38 27 39 fileSystems."/" = { 28 40 device = "/dev/disk/by-uuid/1a4f9537-2962-4c6e-8bd7-1fe5ee97fb2a"; ··· 45 57 size = 4096; 46 58 } 47 59 ]; 60 + 61 + zramSwap.enable = true; 48 62 49 63 nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 50 64 hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+2
modules/core.nix
··· 4 4 imports = [ 5 5 ./caps_to_esc.nix 6 6 ./stylix.nix 7 + ./desktop 7 8 ]; 8 9 9 10 freyjaModules = { 10 11 stylix.enable = lib.mkDefault true; 11 12 capsToEsc.enable = lib.mkDefault true; 13 + desktop.gnome.enable = lib.mkDefault true; 12 14 }; 13 15 14 16 system.stateVersion = "25.11";
+1
modules/default.nix
··· 2 2 imports = [ 3 3 ./services 4 4 ./core.nix 5 + ./desktop 5 6 ]; 6 7 }
+5
modules/desktop/default.nix
··· 1 + { 2 + imports = [ 3 + ./gnome.nix 4 + ]; 5 + }
+28
modules/desktop/gnome.nix
··· 1 + { 2 + config, 3 + pkgs, 4 + lib, 5 + ... 6 + }: 7 + let 8 + cfg = config.freyjaModules.desktop.gnome; 9 + in 10 + { 11 + options.freyjaModules.desktop.gnome = { 12 + enable = lib.mkEnableOption "Enable gnome desktop environment with GDM"; 13 + }; 14 + 15 + config = lib.mkIf cfg.enable { 16 + services.displayManager.gdm.enable = true; 17 + services.desktopManager = { 18 + gnome.enable = true; 19 + }; 20 + 21 + environment.gnome.excludePackages = with pkgs; [ 22 + epiphany 23 + simple-scan 24 + gnome-console 25 + ]; 26 + }; 27 + 28 + }