diff --git a/flake.lock b/flake.lock index 70fedea..0833840 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1753056897, + "narHash": "sha256-AVVMBFcuOXqIgmShvRv9TED3fkiZhQ0ZvlhsPoFfkNE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "13a83d1b6545b7f0e8f7689bad62e7a3b1d63771", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix index c75c22a..c290e94 100644 --- a/hosts/framework/configuration.nix +++ b/hosts/framework/configuration.nix @@ -8,9 +8,38 @@ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.default - ../../modules/nixos/cosmic.nix + # ../../modules/nixos/cosmic.nix # ../../modules/nixos/niri.nix ]; + + specialisation = { + cosmic = { + inheritParentConfig = true; + configuration = { + imports = [ + ../../modules/nixos/cosmic.nix + ]; + environment.etc."active-specialisation".text = "cosmic"; + }; + }; + wm = { + inheritParentConfig = true; + configuration = { + services.displayManager.ly = { + x11Support = false; + enable = true; + }; + environment.etc."active-specialisation".text = "wm"; + programs.niri.enable = true; + environment.systemPackages = with pkgs; [ + alacritty + ghostty + fuzzel + ]; + }; + }; + }; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -22,16 +51,6 @@ # Enable networking networking.networkmanager.enable = true; - # Exjobb for pies - services.avahi.enable = true; - networking.firewall = { - enable = true; - allowedTCPPorts = [8080]; - allowedUDPPorts = [ - 8080 - ]; - }; - # Set your time zone. time.timeZone = "Europe/Stockholm"; @@ -100,19 +119,11 @@ inputs.zen-browser.packages.${pkgs.system}.default tmux fastfetch - nmap - networkmanagerapplet spotify evince loupe - - ## remove after xjob - postman - wireshark ]; - programs.wireshark.enable = true; - programs.steam.enable = true; # List services that you want to enable: @@ -124,14 +135,5 @@ nerd-fonts.jetbrains-mono ]; - #vm - programs.virt-manager.enable = true; - - users.groups.libvirtd.members = ["bruhng"]; - - virtualisation.libvirtd.enable = true; - - virtualisation.spiceUSBRedirection.enable = true; - system.stateVersion = "25.05"; # Do not channge } diff --git a/update.sh b/update.sh index f8de357..66a14f8 100644 --- a/update.sh +++ b/update.sh @@ -20,7 +20,7 @@ fi git add . echo "New changes, Rebuilding..." -sudo nixos-rebuild switch --upgrade --flake . +sudo nixos-rebuild switch --upgrade --flake . --specialisation $(cat /etc/active-specialisation) current=$(nixos-rebuild list-generations | grep current)