From 200e9eb7da0005a161617e90891109b47cd92174 Mon Sep 17 00:00:00 2001 From: tristan Date: Fri, 13 Jun 2025 11:53:32 +0100 Subject: [PATCH 1/9] framework: nix-index, nh, qt, comma --- flake.nix | 44 ------------------------------------------- nixos/default.nix | 7 +++++-- nixos/workstation.nix | 1 + 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/flake.nix b/flake.nix index 26369b5..442ed27 100644 --- a/flake.nix +++ b/flake.nix @@ -52,22 +52,6 @@ ]; }; - FCS-Tristan-Nixbook = mkConf { - nixos-modules = [ - ./hardware/fcs-tristan-nixbook.nix - ./nixos/workstation.nix - ./nixos/modules/work.nix - ./nixos/programs/cosmic.nix - ./nixos/programs/libvertd.nix - ./nixos/programs/hyprland.nix - ]; - home-modules = [ - ./home/programs/work.nix - ./home/programs/graphical.nix - ./home/desktop/cosmic/laptop.nix - ]; - }; - framework-13 = mkConf { nixos-modules = [ ./hardware/framework-13.nix @@ -102,26 +86,6 @@ ]; }; - vm-sway = - builtins.trace '' - use super+enter to start a terminal. - use super+d to launch applications - - start the vm with '-vga qxl' or '-vga virtio' - '' - mkConf - { - nixos-modules = [ - ./hardware/vm.nix - (auto-login "sway") - ./nixos/workstation.nix - ]; - home-modules = [ - ./home/desktop/sway/. - ./home/workstation.nix - ]; - }; - vm-cosmic = mkConf { @@ -136,14 +100,6 @@ }; vm-hyprland = - builtins.trace '' - use super+enter to start a terminal. - use super+d to launch applications - - Hyprland is VERY SLOW in the VM. - - start with '-vga virtio' - '' mkConf { nixos-modules = [ diff --git a/nixos/default.nix b/nixos/default.nix index 04cca58..be17b83 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -96,8 +96,7 @@ in { sops lsof nix-tree - nix-index - nh + comma jq ]; @@ -109,4 +108,8 @@ in { enable = true; enabledCollectors = ["systemd"]; }; + + programs.nix-index.enable = true; + programs.nh.enable = true; + } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 1d24a21..334e4de 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -53,6 +53,7 @@ }; }; }; + qt.enable = true; nixpkgs.overlays = [ (final: prev: { From 2b74b7218ba1a96e5558385a93f908bd0566c5f7 Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 24 Jun 2025 14:27:07 +0100 Subject: [PATCH 2/9] framework: nixvim lsp-format, btrfs scrub --- flake.lock | 36 ++++++++++++++++++------------------ hardware/framework-13.nix | 1 + lib/nixvim.nix | 8 +------- nixos/default.nix | 1 + 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 7285e99..9598f6f 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -385,11 +385,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748975233, - "narHash": "sha256-eLz/5C3qQN8w7dyLnY8zKdwLuHuS03s8csuLjTis2No=", + "lastModified": 1749702372, + "narHash": "sha256-X+PDQ9kgt3/nOUQWSyz/8WHFOp+SyDND+bKpVufxpdE=", "owner": "nix-community", "repo": "nixvim", - "rev": "8917e2e8ecc957037c712145ddcfce08d00c1cad", + "rev": "88f452558ea37ab8ab2052cf45b5a5653a1e556b", "type": "github" }, "original": { @@ -466,11 +466,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -503,11 +503,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749058304, - "narHash": "sha256-8fUXBczmQ7/Y8nrc988oaN4M7YZz/RbzZa0n1d8i3GM=", + "lastModified": 1749768934, + "narHash": "sha256-xtWRTlYBs+wYE8NaV+mwdlVYWX0k2BkCuFdjexjEebY=", "owner": "danth", "repo": "stylix", - "rev": "689d4db89d3be6fd82b7dcb41a1cea5c4743b1ef", + "rev": "e1cfc2b69432ac2abe95db133dcbdfc96cd3bedb", "type": "github" }, "original": { diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index b8ef1a9..120e188 100644 --- a/hardware/framework-13.nix +++ b/hardware/framework-13.nix @@ -14,6 +14,7 @@ boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; + services.btrfs.autoScrub.enable = true; fileSystems."/" = { device = "/dev/mapper/crypted"; fsType = "btrfs"; diff --git a/lib/nixvim.nix b/lib/nixvim.nix index e5cc8a4..1b26adb 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -247,13 +247,6 @@ in { vim.lsp.buf.format({async = false}) ''; } - { - event = "BufWritePre"; - pattern = "*.ts"; - callback = luaFunc '' - vim.lsp.buf.format() - ''; - } ]; plugins = { @@ -284,6 +277,7 @@ in { }; }; + lsp-format.enable = true; lsp = { enable = true; inlayHints = true; diff --git a/nixos/default.nix b/nixos/default.nix index be17b83..5241347 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -109,6 +109,7 @@ in { enabledCollectors = ["systemd"]; }; + programs.command-not-found.enable = false; programs.nix-index.enable = true; programs.nh.enable = true; From 960165b7696877fc442ca1913bde6adbd1a7716e Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 24 Jun 2025 15:13:16 +0100 Subject: [PATCH 3/9] framework: fix cosmic conf --- flake.nix | 1 + home/desktop/cosmic/default.nix | 11 +---------- nixos/programs/cosmic.nix | 10 +++++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 6746eb3..f07fd87 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ home-modules = [ ./home/programs/work.nix ./home/programs/graphical.nix + ./home/desktop/cosmic/. ]; }; diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index 7d4bd00..7232003 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -47,16 +47,7 @@ in { output = "all"; rotation_frequency = 600; sampling_method = mkRON "enum" "Alphanumeric"; - scaling_mode = mkRON "enum" { - value = [ - (mkRON "tuple" [ - 0.5 - 1.0 - (mkRON "raw" "0.345354352") - ]) - ]; - variant = "Fit"; - }; + scaling_mode = mkRON "enum" "Zoom"; source = mkRON "enum" { value = [ (toString config.stylix.image) ]; variant = "Path"; diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix index 21f0e54..369930d 100644 --- a/nixos/programs/cosmic.nix +++ b/nixos/programs/cosmic.nix @@ -1,8 +1,8 @@ -{ - inputs, - config, - ... -}: { +{...}: { services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; + # fix for shutdown, not yet in 25.05 + # https://github.com/NixOS/nixpkgs/pull/412260/commits/27c3430d620adfed574674e36a89a52be80f01d9 + services.geoclue2.enable = true; + services.geoclue2.enableDemoAgent = false; } From eb3d4ccfeeb0d4c503375f41896e07127b5b6bbf Mon Sep 17 00:00:00 2001 From: tristan Date: Sat, 28 Jun 2025 11:14:51 +0100 Subject: [PATCH 4/9] zenix: enable kernel logging again --- hardware/zenix.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 715f396..d76130a 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -51,14 +51,12 @@ in { }; fileSystems."/mnt/hdd" = { - device = "/dev/disk/by-uuid/50d1b0ee-9eb1-4493-acea-4e5bd4b127c8"; - fsType = "ext4"; + device = "/dev/disk/by-label/seagate-disk-1"; + fsType = "btrfs"; + options = ["subvol=@steam" "compress=zstd" "autodefrag"]; }; boot.plymouth.enable = true; - boot.initrd.verbose = false; - boot.consoleLogLevel = 1; - boot.kernelParams = ["quiet" "udev.log_level=3"]; swapDevices = [{device = "/dev/disk/by-label/swap";}]; @@ -72,7 +70,8 @@ in { networking.networkmanager.appendNameservers = ["1.1.1.1" "1.0.0.1"]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = true; + hardware.cpu.x86.msr.enable = true; hardware.keyboard.zsa.enable = true; From 65646a11ed4c44517625b3c505956492843f6245 Mon Sep 17 00:00:00 2001 From: tristan Date: Sat, 28 Jun 2025 11:21:54 +0100 Subject: [PATCH 5/9] zenix(cosmic): rm laptop, numlock on, cursor focus fast --- home/desktop/cosmic/default.nix | 2 ++ home/desktop/cosmic/laptop.nix | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 home/desktop/cosmic/laptop.nix diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index 7d4bd00..8efbee1 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -34,10 +34,12 @@ in { compositor = { autotile = true; focus_follows_cursor = true; + focus_follows_cursor_delay = 25; input_default = mkRON "optional" { profile = (mkRON "optional" (mkRON "enum" "Flat")); speed = 0.0; }; + keyboard_config.numlock_state = (mkRON "enum" "BootOn"); }; wallpapers = [ diff --git a/home/desktop/cosmic/laptop.nix b/home/desktop/cosmic/laptop.nix deleted file mode 100644 index c51036b..0000000 --- a/home/desktop/cosmic/laptop.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - programs.cosmic = { - panels.Bar.applets.end = [ - "com.system76.CosmicAppletBattery" - ]; - }; -} From 823b45d557f8f0ba021830baaa840876652576a3 Mon Sep 17 00:00:00 2001 From: tristan Date: Thu, 3 Jul 2025 16:37:23 +0100 Subject: [PATCH 6/9] framework: add keychron udev, add jujutsu --- hardware/zenix.nix | 2 -- home/programs/git.nix | 4 ++++ nixos/workstation.nix | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 715f396..dbe2913 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -74,8 +74,6 @@ in { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.keyboard.zsa.enable = true; - networking.hostName = "zenix"; services.openssh.enable = true; diff --git a/home/programs/git.nix b/home/programs/git.nix index 1e9f122..cc2b2ab 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -52,4 +52,8 @@ programs.lazygit = { enable = true; }; + + programs.jujutsu = { + enable = true; + }; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 334e4de..a6e56c4 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -75,4 +75,10 @@ enable = true; indicator = true; }; + + hardware.keyboard.zsa.enable = true; + # enable keychron keyboard configuration + services.udev.extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3434", ATTRS{idProduct}=="0e60", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + ''; } From f6c272f35e011ac6f565329bdeb7dc10fd2013c3 Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 8 Jul 2025 15:51:01 +0100 Subject: [PATCH 7/9] framework: gruvbox again, fix mouse accel --- home/desktop/cosmic/default.nix | 21 ++++++++++----------- nixos/workstation.nix | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index 7232003..b21fd75 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -6,12 +6,13 @@ ... }: let inherit (config.lib.cosmic) mkRON; - mkAction = variant: action: mkRON "enum" { - inherit variant; - value = [ - (mkRON "enum" action) - ]; - }; + mkAction = variant: action: + mkRON "enum" { + inherit variant; + value = [ + (mkRON "enum" action) + ]; + }; in { imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager]; wayland.desktopManager.cosmic = { @@ -34,8 +35,8 @@ in { compositor = { autotile = true; focus_follows_cursor = true; - input_default = mkRON "optional" { - profile = (mkRON "optional" (mkRON "enum" "Flat")); + input_default.acceleration = mkRON "optional" { + profile = mkRON "optional" (mkRON "enum" "Flat"); speed = 0.0; }; }; @@ -49,7 +50,7 @@ in { sampling_method = mkRON "enum" "Alphanumeric"; scaling_mode = mkRON "enum" "Zoom"; source = mkRON "enum" { - value = [ (toString config.stylix.image) ]; + value = [(toString config.stylix.image)]; variant = "Path"; }; } @@ -89,7 +90,5 @@ in { size = mkRON "enum" "XS"; } ]; - }; - } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index a6e56c4..6620850 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -34,6 +34,7 @@ stylix = { enable = true; image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; polarity = "dark"; opacity = { terminal = 0.9; From b96e88ceefffd86c3efb942fd9292c57b251f7f5 Mon Sep 17 00:00:00 2001 From: tristan Date: Wed, 16 Jul 2025 00:42:02 +0100 Subject: [PATCH 8/9] zenix: update, add niri --- flake.lock | 172 ++++++++++------------------------------ flake.nix | 1 + nixos/programs/niri.nix | 16 ++++ 3 files changed, 59 insertions(+), 130 deletions(-) create mode 100644 nixos/programs/niri.nix diff --git a/flake.lock b/flake.lock index ba7e822..3f80e7b 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -107,21 +107,6 @@ "type": "github" } }, - "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -172,11 +157,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -219,54 +204,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -291,33 +228,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1752544374, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { @@ -391,11 +306,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { @@ -406,11 +321,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -430,11 +345,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1750512587, - "narHash": "sha256-kZqTQEARUkkKDFhECd0MGU4wXCJcxCdh5WeM/yD6oI4=", + "lastModified": 1752010420, + "narHash": "sha256-fboKrq2WeEC2Y4LaZNiiH2dptUYHtSbYhzE0FTN/u+M=", "owner": "nix-community", "repo": "nixvim", - "rev": "b04bcdcbba4aa648903e065ad1907a97d4f7aee9", + "rev": "a11133507a930dfd235324cdf776bdb5e6ddd717", "type": "github" }, "original": { @@ -457,11 +372,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -512,11 +427,11 @@ ] }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -532,11 +447,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], @@ -549,11 +461,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750697672, - "narHash": "sha256-F8z6QXKRZfVKwTj8+Uw920tHGDmiRIOD+BsA6wVGOgY=", + "lastModified": 1752599753, + "narHash": "sha256-8ppgjqbFc/697OXgMntMhk+kAQF4BHBog73oP6Xds8Y=", "owner": "danth", "repo": "stylix", - "rev": "438a702dc2a49a48eae380623cdc04fe36ef5422", + "rev": "a35db84c7568c75f3ec665fdcd962cc9c52b6c0a", "type": "github" }, "original": { @@ -644,11 +556,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -660,11 +572,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -676,11 +588,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -716,11 +628,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1750219862, - "narHash": "sha256-wce+erYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q=", + "lastModified": 1752293576, + "narHash": "sha256-84tAzrC/kioWRmG0jLt1HWRP/wHON7zjLtXCwWRNI/g=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb", + "rev": "1a40cdcb093a0025631ef692caa53130f821dd77", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f07fd87..fbba60b 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ nixos-modules = [ ./hardware/zenix.nix ./nixos/programs/cosmic.nix + ./nixos/programs/niri.nix ./nixos/programs/gamer.nix ./nixos/programs/personal.nix ./nixos/services/musnix.nix diff --git a/nixos/programs/niri.nix b/nixos/programs/niri.nix new file mode 100644 index 0000000..65c190c --- /dev/null +++ b/nixos/programs/niri.nix @@ -0,0 +1,16 @@ +{pkgs, ...}: { + programs.niri = { + enable = true; + }; + + imports = [ + ./pipewire.nix + ../workstation.nix + ]; + + environment.systemPackages = [pkgs.fuzzel]; + + # home-manager.users.${config.user}.imports = [ + # ../../home/desktop/niri/. + # ]; +} From 8ae09da94c1a00e41f7c8453d2163b0bc4c2f7de Mon Sep 17 00:00:00 2001 From: Tristan Beedell Date: Wed, 16 Jul 2025 13:01:10 +0100 Subject: [PATCH 9/9] framework: wofi -> tofi, add cosmic rbw bindings --- home/desktop/cosmic/default.nix | 24 +++++++++++++++++++----- home/workstation.nix | 7 +++---- nixos/workstation.nix | 2 ++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index b21fd75..7583e66 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, inputs, @@ -9,10 +8,9 @@ mkAction = variant: action: mkRON "enum" { inherit variant; - value = [ - (mkRON "enum" action) - ]; + value = [action]; }; + mkEnumAction = variant: action: mkAction variant (mkRON "enum" action); in { imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager]; wayland.desktopManager.cosmic = { @@ -27,9 +25,25 @@ in { shortcuts = [ { - action = mkAction "System" "Terminal"; + action = mkEnumAction "System" "Terminal"; key = "Super+Return"; } + { + action = mkEnumAction "System" "Screenshot"; + key = "Super+Shift+S"; + } + { + action = mkAction "Spawn" "bwmenu"; + key = "Super+P"; + } + { + action = mkAction "Spawn" "bwusernamemenu"; + key = "Super+Ctrl+P"; + } + { + action = mkAction "Spawn" "bwotpmenu"; + key = "Super+Shift+P"; + } ]; compositor = { diff --git a/home/workstation.nix b/home/workstation.nix index 0ae98e5..597c5da 100644 --- a/home/workstation.nix +++ b/home/workstation.nix @@ -18,9 +18,9 @@ ]; programs.menu = { - package = pkgs.tofi; - dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true"; - drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true"; + package = pkgs.wofi; + dmenuCommand = "${lib.getExe pkgs.wofi} --show dmenu"; + drunCommand = "${lib.getExe pkgs.wofi} --show drun"; }; home.packages = with pkgs; [ @@ -47,6 +47,5 @@ ] ''; - services.gnome-keyring.enable = true; services.hyprpaper.enable = lib.mkForce false; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 6620850..d99aaac 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -22,6 +22,8 @@ hardware.bluetooth.enable = true; services.blueman.enable = true; + services.gnome.gnome-keyring.enable = true; + programs.kdeconnect.enable = true; virtualisation.waydroid.enable = true;