Compare commits

..

No commits in common. "48f66e6227dea36ed10ff21937955c4e8c4f56d0" and "fdd7e1c5834ba71a8d1771860fd28cd912e27b8b" have entirely different histories.

10 changed files with 21 additions and 96 deletions

60
flake.lock generated
View file

@ -3,16 +3,16 @@
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1774065775, "lastModified": 1773115390,
"narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=", "narHash": "sha256-nl1kcyM1locj//JnzC43hZIjY4z5opcTPqv1RnMZqPU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192", "rev": "aecb1fc3e18c3cdcbdd96485b392ffa4584467e8",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773963144, "lastModified": 1772985280,
"narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a91b3ea73a765614d90360580b689c48102d1d33", "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,33 +43,13 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773814637, "lastModified": 1772822230,
"narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,29 +59,11 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

View file

@ -4,26 +4,20 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-unstable = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/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 = { nixosConfigurations = {
@ -77,11 +71,11 @@
]; ];
}; };
nova = nixpkgs-unstable.lib.nixosSystem { nova = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/nova ./hosts/nova
home-manager-unstable.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
useGlobalPkgs = true; useGlobalPkgs = true;

View file

@ -7,11 +7,10 @@
./modules/devel.nix ./modules/devel.nix
./modules/firefox.nix ./modules/firefox.nix
./modules/fonts.nix ./modules/fonts.nix
./modules/gpg.nix
./modules/media.nix ./modules/media.nix
./modules/niri.nix
./modules/password-store.nix
./modules/user-dirs.nix ./modules/user-dirs.nix
./modules/gpg.nix
./modules/password-store.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -5,7 +5,7 @@
anonymousPro anonymousPro
cantarell-fonts cantarell-fonts
cascadia-code cascadia-code
charis charis-sil
cm_unicode cm_unicode
corefonts corefonts
dejavu_fonts dejavu_fonts

View file

@ -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
];
}

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -100,7 +100,7 @@
config = "lua require 'colorizer'.setup()"; config = "lua require 'colorizer'.setup()";
} }
{ {
plugin = nvim-lspconfig; plugin = nvim-lspconfig;
type = "lua"; type = "lua";
config = '' config = ''
@ -112,8 +112,8 @@
vim.lsp.enable('texlab') vim.lsp.enable('texlab')
vim.lsp.enable('ts_ls') vim.lsp.enable('ts_ls')
vim.lsp.enable('vimls') vim.lsp.enable('vimls')
vim.api.nvim_del_keymap('i', '<c-s>') vim.api.nvim_del_keymap('i', '<c-s>')
vim.keymap.set({ 'i' }, "<c-tab>", vim.lsp.buf.signature_help, { desc = "Show signature help" })
''; '';
} }
@ -143,7 +143,6 @@
''; '';
} }
quarto-nvim
typescript-vim typescript-vim
{ {

View file

@ -25,10 +25,8 @@
openssl openssl
pandoc pandoc
pdftk pdftk
quarto
ripmime ripmime
urlscan urlscan
visidata
w3m w3m
]; ];
} }

View file

@ -24,7 +24,6 @@ let
progress progress
purrr purrr
qrcode qrcode
quarto
RColorBrewer RColorBrewer
readODS readODS
revealjs revealjs

View file

@ -12,7 +12,6 @@
../../system/desktop/ergodox-udev.nix ../../system/desktop/ergodox-udev.nix
# ../../system/desktop/gnome.nix # ../../system/desktop/gnome.nix
../../system/desktop/cosmic.nix ../../system/desktop/cosmic.nix
../../system/desktop/niri.nix
../../system/desktop/steam.nix ../../system/desktop/steam.nix
../../system/desktop/yubikey-pam.nix ../../system/desktop/yubikey-pam.nix
]; ];

View file

@ -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;
};
}