diff --git a/flake.lock b/flake.lock index 0cc8e47..a5a422c 100644 --- a/flake.lock +++ b/flake.lock @@ -85,16 +85,16 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -281,16 +281,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692339729, - "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", + "lastModified": 1707650010, + "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae521bd4e460b076a455dca8b13f4151489a725c", + "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4fbe5fe..af2871f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,13 @@ description = "spec's nixos configs"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix.url = "github:Mic92/sops-nix"; xremap.url = "github:xremap/nix-flake"; hyprland.url = "github:hyprwm/Hyprland"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; disko = { @@ -67,16 +67,15 @@ ./modules/system/desktop-environments/tuigreet.nix ./modules/system/desktop-environments/hyprland.nix ./modules/system/desktop-environments/budgie.nix + ./modules/system/desktop-environments/gnome.nix ./hosts/katana/default.nix ./hosts/katana/bluetooth.nix ./hosts/katana/networkd.nix ./hosts/katana/system-pkgs.nix ./modules/system/services/docker.nix ./modules/system/services/openssh.nix - ./modules/system/desktop-environments/gnome.nix ./modules/system/services/syncthing.nix ./modules/system/services/tailscale.nix - ] #extra modules to be loaded by nixos [ hyprland.homeManagerModules.default @@ -89,7 +88,6 @@ ./modules/home-manager/zoxide.nix ./modules/home-manager/ncspot.nix ./modules/home-manager/zellij.nix - ./modules/home-manager/nushell.nix ./modules/home-manager/direnv.nix ./modules/home-manager/home-manager.nix ./modules/home-manager/starship.nix diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix index acc8faf..2889cc3 100644 --- a/hosts/katana/default.nix +++ b/hosts/katana/default.nix @@ -32,7 +32,6 @@ services = { printing.enable = true; xserver = { - displayManager.gdm.enable = true; layout = "us"; xkbVariant = ""; }; @@ -65,7 +64,7 @@ hyprland.enable = false; gnome.enable = false; budgie.enable = true; - displayManager.tuigreet.enable = true; + displayManager.tuigreet.enable = false; }; }; fonts.fonts = with pkgs; [ diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix index f455b14..6deb3f8 100644 --- a/hosts/katana/system-pkgs.nix +++ b/hosts/katana/system-pkgs.nix @@ -25,5 +25,6 @@ felix-fm gitui spotify + zulip ]; } \ No newline at end of file diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix index 752b5f8..74f9815 100644 --- a/modules/home-manager/alacritty.nix +++ b/modules/home-manager/alacritty.nix @@ -16,7 +16,7 @@ lines = 25; }; decorations = "full"; - opacity = 0.9; + opacity = 1.0; title = "Alacritty"; }; font = { diff --git a/modules/home-manager/nushell.nix b/modules/home-manager/nushell.nix deleted file mode 100644 index c891a86..0000000 --- a/modules/home-manager/nushell.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, config, lib, ...}: -{ - programs.nushell = { - enable = false; - }; -} \ No newline at end of file diff --git a/modules/system/desktop-environments/budgie.nix b/modules/system/desktop-environments/budgie.nix index 23873b5..babee3f 100644 --- a/modules/system/desktop-environments/budgie.nix +++ b/modules/system/desktop-environments/budgie.nix @@ -14,10 +14,13 @@ in { environment.systemPackages = with pkgs; [ budgie.budgie-desktop-with-plugins + lightdm ]; services.xserver = { enable = true; desktopManager.budgie.enable = true; + displayManager.gdm.enable = true; }; + }; } diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix index c752e58..3ddab26 100644 --- a/modules/system/desktop-environments/gnome.nix +++ b/modules/system/desktop-environments/gnome.nix @@ -30,11 +30,11 @@ in { enable = true; wayland = true; }; - # defaultSession = lib.mkDefault "gnome"; + defaultSession = lib.mkDefault "budgie-desktop"; }; desktopManager = { xterm.enable = false; - gnome.enable = lib.mkDefault true; + # gnome.enable = lib.mkDefault true; }; }; }; diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix index 4b334ff..215c83c 100644 --- a/users/speccon18/home.nix +++ b/users/speccon18/home.nix @@ -21,7 +21,7 @@ firefox discord gimp - obsidian + # obsidian neofetch vlc remmina