diff --git a/flake.lock b/flake.lock index 3da32ce..2ba8a85 100644 --- a/flake.lock +++ b/flake.lock @@ -393,11 +393,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { diff --git a/home/hosts/jude/default.nix b/home/hosts/jude/default.nix index 8ef40e8..eefc406 100644 --- a/home/hosts/jude/default.nix +++ b/home/hosts/jude/default.nix @@ -6,9 +6,9 @@ ]; home.packages = with pkgs; [ (mumble.override { pulseSupport = true; }) - fluffychat logseq ]; greg.gui = true; - greg.sway = true; + greg.sway = false; + greg.gnome = false; } diff --git a/home/modules/gui.nix b/home/modules/gui.nix index f04b79d..ca87db7 100644 --- a/home/modules/gui.nix +++ b/home/modules/gui.nix @@ -24,7 +24,9 @@ in { home.packages = with pkgs; ( excludes ["x86_64-darwin" "aarch64-darwin"] [ cdrtools - element-desktop + fluffychat + cinny-desktop + qpwgraph vlc x265 ]) ++ diff --git a/hosts/jude/boot.nix b/hosts/jude/boot.nix index 68cb064..1a1d0b9 100644 --- a/hosts/jude/boot.nix +++ b/hosts/jude/boot.nix @@ -3,6 +3,7 @@ { # Use the systemd-boot EFI boot loader. boot = { + binfmt.emulatedSystems = [ "aarch64-linux" ]; kernelPackages = pkgs.linuxPackages_latest; supportedFilesystems = [ "ntfs" ]; loader = { diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index 361ba7e..9ffe4a6 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -23,12 +23,17 @@ hostName = "jude"; enableIPv6 = false; interfaces.enp12s0.useDHCP = true; - firewall.enable = true; + firewall = { + enable = false; + allowedTCPPorts = [ 21000 ]; + allowedUDPPorts = [ 21000 21010 ]; + }; }; greg = { tailscale.enable = true; - sway.enable = true; - kde.enable = false; + sway.enable = false; + gnome.enable = false; + kde.enable = true; }; environment.systemPackages = with pkgs; [ @@ -37,12 +42,14 @@ darktable expect gimp + gparted gnucash graphviz flock ffmpeg handbrake imagemagick + immersed-vr libtheora libxml2 linode-cli diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 96bf46d..a2584f6 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -25,7 +25,7 @@ lshw ]; - system.stateVersion = "22.05"; + system.stateVersion = "24.05"; nix = { gc.dates = "weekly"; diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index b5e8c95..e820feb 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -17,7 +17,7 @@ in with lib; { enable = true; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; - layout = "us"; + xkb.layout = "us"; # Trackpad support libinput.enable = true; }; diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index 53fbe4f..d7776e6 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -13,9 +13,12 @@ in with lib; { services = { xserver = { enable = true; - displayManager.sddm.enable = true; - desktopManager.plasma5.enable = true; - layout = "us"; + desktopManager.plasma6.enable = true; + displayManager = { + defaultSession = "plasma"; + sddm.enable = true; + }; + xkb.layout = "us"; # Trackpad support libinput.enable = true; };