diff --git a/flake.lock b/flake.lock index 7f41e2f..206b93f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "firefox-addons": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774065775, - "narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=", + "lastModified": 1773115390, + "narHash": "sha256-nl1kcyM1locj//JnzC43hZIjY4z5opcTPqv1RnMZqPU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192", + "rev": "aecb1fc3e18c3cdcbdd96485b392ffa4584467e8", "type": "gitlab" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1773963144, - "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a91b3ea73a765614d90360580b689c48102d1d33", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -43,33 +43,13 @@ "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": 1773814637, - "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -79,29 +59,11 @@ "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", - "home-manager-unstable": "home-manager-unstable", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index b07dcd1..4db8565 100644 --- a/flake.nix +++ b/flake.nix @@ -4,26 +4,20 @@ 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-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, ... }@inputs: { nixosConfigurations = { @@ -77,11 +71,11 @@ ]; }; - nova = nixpkgs-unstable.lib.nixosSystem { + nova = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ ./hosts/nova - home-manager-unstable.nixosModules.home-manager { + home-manager.nixosModules.home-manager { home-manager = { extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; diff --git a/home/desktop-slim.nix b/home/desktop-slim.nix index 0ddcb83..9979ab9 100644 --- a/home/desktop-slim.nix +++ b/home/desktop-slim.nix @@ -7,11 +7,10 @@ ./modules/devel.nix ./modules/firefox.nix ./modules/fonts.nix - ./modules/gpg.nix ./modules/media.nix - ./modules/niri.nix - ./modules/password-store.nix ./modules/user-dirs.nix + ./modules/gpg.nix + ./modules/password-store.nix ]; home.packages = with pkgs; [ diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index fa3eb6c..23d9e4a 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -5,7 +5,7 @@ anonymousPro cantarell-fonts cascadia-code - charis + charis-sil cm_unicode corefonts dejavu_fonts diff --git a/home/modules/niri.nix b/home/modules/niri.nix deleted file mode 100644 index e29b384..0000000 --- a/home/modules/niri.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - 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 - ]; -} diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index 1847781..c417c93 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { 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,7 +143,6 @@ ''; } - quarto-nvim typescript-vim { diff --git a/home/modules/office-cli.nix b/home/modules/office-cli.nix index 90331aa..cf86068 100644 --- a/home/modules/office-cli.nix +++ b/home/modules/office-cli.nix @@ -25,10 +25,8 @@ openssl pandoc pdftk - quarto ripmime urlscan - visidata w3m ]; } diff --git a/home/modules/r.nix b/home/modules/r.nix index e284118..8b1b3ed 100644 --- a/home/modules/r.nix +++ b/home/modules/r.nix @@ -24,7 +24,6 @@ let progress purrr qrcode - quarto RColorBrewer readODS revealjs diff --git a/hosts/nova/default.nix b/hosts/nova/default.nix index 8afaee2..482b1bf 100644 --- a/hosts/nova/default.nix +++ b/hosts/nova/default.nix @@ -12,7 +12,6 @@ ../../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 deleted file mode 100644 index d55d052..0000000 --- a/system/desktop/niri.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, ... }: - -{ - programs.niri.enable = true; - - services.gnome.gnome-keyring.enable = lib.mkForce false; - - programs.firefox.preferences = { - "widget.gtk.libadwaita-colors.enabled" = false; - }; -}