From 3c0e9c18deb71112a76e9f686f8394e723ecc318 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 30 Aug 2025 16:32:18 +0100 Subject: [PATCH] zenix: update, rm cosmic --- flake.lock | 74 +++++++++++++++++------------------ flake.nix | 4 -- hardware/zenix.nix | 11 +----- home/default.nix | 2 + home/programs/graphical.nix | 1 - nixos/default.nix | 7 ++-- nixos/programs/auto-login.nix | 10 ----- nixos/programs/gamer.nix | 5 ++- nixos/workstation.nix | 12 ++---- 9 files changed, 52 insertions(+), 74 deletions(-) delete mode 100644 nixos/programs/auto-login.nix diff --git a/flake.lock b/flake.lock index 43e5c2f..f6adf84 100644 --- a/flake.lock +++ b/flake.lock @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -300,11 +300,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754744872, - "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=", + "lastModified": 1756451209, + "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7", + "rev": "cdfffe0b009582f5161dcd030a5549236287767b", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754742008, - "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=", + "lastModified": 1756448032, + "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", "owner": "YaLTeR", "repo": "niri", - "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39", + "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", "type": "github" }, "original": { @@ -364,11 +364,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1756469547, + "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "41d292bfc37309790f70f4c120b79280ce40af16", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1756386758, + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754262585, - "narHash": "sha256-Yz5dJ0VzGRzSRHdHldsWQbuFYmtP3NWNreCvPfCi9CI=", + "lastModified": 1755727480, + "narHash": "sha256-eb9N7XFj1zirk+D2KV+rn/CjmVHDISlxhtZCWZEVpkM=", "owner": "nix-community", "repo": "nixvim", - "rev": "ab1b5962e1ca90b42de47e1172e0d24ca80e6256", + "rev": "6df0b97b39baa1c0b3002b051f307aed68e17d1b", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -536,11 +536,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754599117, - "narHash": "sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8=", + "lastModified": 1755710103, + "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", "owner": "danth", "repo": "stylix", - "rev": "312dec38b2231b21f36903d1bdce96daa11548ff", + "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", "type": "github" }, "original": { @@ -701,16 +701,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -718,11 +718,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754533920, - "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "lastModified": 1756260173, + "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", "type": "github" }, "original": { @@ -736,11 +736,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1754540523, - "narHash": "sha256-Wgv2qVckt8q11/xErY7hYdLAPcoOnZ0BkMLqyXegCzQ=", + "lastModified": 1756526767, + "narHash": "sha256-aMcUT5QOgVghB+x89xf9+Phc/BTIQfoitVIcQ66ZQWk=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "451454de40a4433174153e823994fe2ecd3c869e", + "rev": "3cef1d4a0b597c1746d399cc46ef98a53af9a732", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1c1bbae..f7c8766 100644 --- a/flake.nix +++ b/flake.nix @@ -42,8 +42,6 @@ pkgs = import inputs.nixpkgs {inherit system;}; user = "tristan"; userFullname = "Tristan Beedell"; - # auto-login = import ./nixos/programs/auto-login.nix; - mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;}; in { formatter.${system} = pkgs.alejandra; @@ -51,7 +49,6 @@ zenix = mkConf { nixos-modules = [ ./hardware/zenix.nix - ./nixos/programs/cosmic.nix ./nixos/programs/niri.nix ./nixos/programs/gamer.nix ./nixos/programs/personal.nix @@ -62,7 +59,6 @@ ./home/programs/graphical.nix ./home/programs/gamer.nix ./home/programs/personal/. - ./home/desktop/cosmic/. ]; }; diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 7408fa1..8a3100d 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -1,12 +1,9 @@ { - config, lib, - pkgs, modulesPath, + user, ... -}: let - user = config.user; -in { +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ./ddc.nix @@ -31,10 +28,6 @@ in { options = ["noatime"]; }; - # boot.initrd.luks.devices."usbkey" = { - # device = "/dev/disk/by-label/usbkey1"; - # }; - boot.initrd.luks.devices."cryptroot" = { device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151"; }; diff --git a/home/default.nix b/home/default.nix index 3c46f22..824d722 100644 --- a/home/default.nix +++ b/home/default.nix @@ -41,6 +41,8 @@ programs.yazi.enable = true; + programs.bat.enable = true; + programs.zoxide.enable = true; programs.rbw = { diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index df550f1..9cb3e2c 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -25,7 +25,6 @@ youtube-music transmission_4-gtk feishin - grayjay # other element-desktop diff --git a/nixos/default.nix b/nixos/default.nix index 6f108e8..7b805cb 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,13 +1,11 @@ # https://search.nixos.org/options { inputs, - config, pkgs, lib, + user, ... -}: let - user = config.user; -in { +}: { nix = { settings = { experimental-features = ["nix-command" "flakes" "pipe-operators"]; @@ -98,6 +96,7 @@ in { nix-tree comma jq + bat ]; boot.kernel.sysctl = { diff --git a/nixos/programs/auto-login.nix b/nixos/programs/auto-login.nix deleted file mode 100644 index 9c93810..0000000 --- a/nixos/programs/auto-login.nix +++ /dev/null @@ -1,10 +0,0 @@ -command: {user, ...}: { - services.greetd = { - enable = true; - settings = { - default_session = { - inherit command user; - }; - }; - }; -} diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index 7356755..e1ddbec 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -12,10 +12,13 @@ dedicatedServer.openFirewall = true; gamescopeSession = { enable = true; - args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync"]; + args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync" "--xwayland-count" "2"]; env = { + PROTON_ENABLE_WAYLAND = "1"; + PROTON_ENABLE_HDR = "1"; ENABLE_HDR_WSI = "1"; DXVK_HDR = "1"; + STEAM_MULTIPLE_XWAYLANDS = "1"; }; }; }; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 3667716..eea2baa 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -3,6 +3,7 @@ pkgs, lib, config, + user, ... }: { imports = [ @@ -28,6 +29,8 @@ virtualisation.waydroid.enable = true; + services.displayManager.cosmic-greeter.enable = true; + networking.stevenblack = { enable = lib.mkDefault true; block = ["porn" "gambling"]; @@ -76,18 +79,11 @@ }; qt.enable = true; - nixpkgs.overlays = [ - (final: prev: { - interalia = prev.callPackage ../pkgs/interalia.nix {}; - }) - ]; - fonts.packages = with pkgs; [ nerd-fonts.symbols-only - interalia ]; - home-manager.users.${config.user}.imports = [ + home-manager.users.${user}.imports = [ ../home/workstation.nix ];