From 686d6071553de7da640089f0570a826d56674378 Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 21 Mar 2026 12:02:45 +0100 Subject: [PATCH 1/2] unstable --- flake.lock | 60 ++++++++++++++++++++++++++++------- flake.nix | 14 +++++--- home/modules/fonts.nix | 2 +- home/modules/niri.nix | 5 +++ home/modules/nvim/default.nix | 7 ++-- home/modules/office-cli.nix | 2 ++ home/modules/r.nix | 1 + hosts/nova/default.nix | 1 + system/desktop/niri.nix | 11 +++++++ 9 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 home/modules/niri.nix create mode 100644 system/desktop/niri.nix diff --git a/flake.lock b/flake.lock index 206b93f..7f41e2f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "firefox-addons": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1773115390, - "narHash": "sha256-nl1kcyM1locj//JnzC43hZIjY4z5opcTPqv1RnMZqPU=", + "lastModified": 1774065775, + "narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "aecb1fc3e18c3cdcbdd96485b392ffa4584467e8", + "rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192", "type": "gitlab" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1773963144, + "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "a91b3ea73a765614d90360580b689c48102d1d33", "type": "github" }, "original": { @@ -43,13 +43,33 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1773814637, + "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", "type": "github" }, "original": { @@ -59,11 +79,29 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "home-manager-unstable": "home-manager-unstable", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 4db8565..b07dcd1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,20 +4,26 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager-unstable = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable, ... }@inputs: { nixosConfigurations = { @@ -71,11 +77,11 @@ ]; }; - nova = nixpkgs.lib.nixosSystem { + nova = nixpkgs-unstable.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ ./hosts/nova - home-manager.nixosModules.home-manager { + home-manager-unstable.nixosModules.home-manager { home-manager = { extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 23d9e4a..fa3eb6c 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -5,7 +5,7 @@ anonymousPro cantarell-fonts cascadia-code - charis-sil + charis cm_unicode corefonts dejavu_fonts diff --git a/home/modules/niri.nix b/home/modules/niri.nix new file mode 100644 index 0000000..40d48d8 --- /dev/null +++ b/home/modules/niri.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + # services.niri.enable = true; +} diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index c417c93..1847781 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ @@ -100,7 +100,7 @@ config = "lua require 'colorizer'.setup()"; } - { + { plugin = nvim-lspconfig; type = "lua"; config = '' @@ -112,8 +112,8 @@ vim.lsp.enable('texlab') vim.lsp.enable('ts_ls') vim.lsp.enable('vimls') - vim.api.nvim_del_keymap('i', '') + vim.keymap.set({ 'i' }, "", vim.lsp.buf.signature_help, { desc = "Show signature help" }) ''; } @@ -143,6 +143,7 @@ ''; } + quarto-nvim typescript-vim { diff --git a/home/modules/office-cli.nix b/home/modules/office-cli.nix index cf86068..90331aa 100644 --- a/home/modules/office-cli.nix +++ b/home/modules/office-cli.nix @@ -25,8 +25,10 @@ openssl pandoc pdftk + quarto ripmime urlscan + visidata w3m ]; } diff --git a/home/modules/r.nix b/home/modules/r.nix index 8b1b3ed..e284118 100644 --- a/home/modules/r.nix +++ b/home/modules/r.nix @@ -24,6 +24,7 @@ let progress purrr qrcode + quarto RColorBrewer readODS revealjs diff --git a/hosts/nova/default.nix b/hosts/nova/default.nix index 482b1bf..8afaee2 100644 --- a/hosts/nova/default.nix +++ b/hosts/nova/default.nix @@ -12,6 +12,7 @@ ../../system/desktop/ergodox-udev.nix # ../../system/desktop/gnome.nix ../../system/desktop/cosmic.nix + ../../system/desktop/niri.nix ../../system/desktop/steam.nix ../../system/desktop/yubikey-pam.nix ]; diff --git a/system/desktop/niri.nix b/system/desktop/niri.nix new file mode 100644 index 0000000..d55d052 --- /dev/null +++ b/system/desktop/niri.nix @@ -0,0 +1,11 @@ +{ lib, ... }: + +{ + programs.niri.enable = true; + + services.gnome.gnome-keyring.enable = lib.mkForce false; + + programs.firefox.preferences = { + "widget.gtk.libadwaita-colors.enabled" = false; + }; +} From 48f66e6227dea36ed10ff21937955c4e8c4f56d0 Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 21 Mar 2026 12:45:36 +0100 Subject: [PATCH 2/2] niri --- home/desktop-slim.nix | 5 +++-- home/modules/niri.nix | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/home/desktop-slim.nix b/home/desktop-slim.nix index 9979ab9..0ddcb83 100644 --- a/home/desktop-slim.nix +++ b/home/desktop-slim.nix @@ -7,10 +7,11 @@ ./modules/devel.nix ./modules/firefox.nix ./modules/fonts.nix - ./modules/media.nix - ./modules/user-dirs.nix ./modules/gpg.nix + ./modules/media.nix + ./modules/niri.nix ./modules/password-store.nix + ./modules/user-dirs.nix ]; home.packages = with pkgs; [ diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 40d48d8..e29b384 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -1,5 +1,14 @@ { ... }: { - # services.niri.enable = true; + programs.alacritty.enable = true; # Super+T in the default setting (terminal) + programs.fuzzel.enable = true; # Super+D in the default setting (app launcher) + programs.swaylock.enable = true; # Super+Alt+L in the default setting (screen locker) + programs.waybar.enable = true; # launch on startup in the default setting (bar) + services.mako.enable = true; # notification daemon + services.swayidle.enable = true; # idle management daemon + services.polkit-gnome.enable = true; # polkit + home.packages = with pkgs; [ + swaybg # wallpaper + ]; }