caandt/nix-conf
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

version bump

Browse source
This commit is contained in:
caandt 2025-01-19 10:24:18 -06:00
parent cdbe64e99b
commit 8193868878
10 changed files with 49 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734088167, "lastModified": 1736864502,
"narHash": "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=", "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "65a441502c9382d41ada1adbc9bd31d6c9b00fe2", "rev": "0141aabed359f063de7413f80d906e1d98c0c123",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1736143030,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -47,11 +47,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1735066341, "lastModified": 1737246960,
"narHash": "sha256-CWWyjOgIMv08M/WScUL1Dvd3cFTSMLJEXyHlArsJ2ZI=", "narHash": "sha256-AsHD6Vfxx4R3FavTj0fZffhWKvg7xbUM1lNM1rryhiU=",
"owner": "wamserma", "owner": "wamserma",
"repo": "flake-programs-sqlite", "repo": "flake-programs-sqlite",
"rev": "832b4e206b87761d5e46fb0ff4df8c13dac93fde", "rev": "2ae6ed65904fc67517e265b59ed1df9e7ee9e2e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735053786, "lastModified": 1737221749,
"narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"umu": "umu" "umu": "umu"
}, },
"locked": { "locked": {
"lastModified": 1735090720, "lastModified": 1737250748,
"narHash": "sha256-Abx/6obaYLgFio8g06pcmMaRPwjKo/bOn1P+gsDMVg0=", "narHash": "sha256-dfmZxGmmwyYPVQCNI0IOOi5R7uFLAK0eHpjKhtntXcE=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "95f1cc7ebe63b5a5af6c2d206ffd422739c5959e", "rev": "bcc7d7ccdc82e63ab261ddea67e1db1d6091c35a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +104,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1737062831,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,23 +120,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1735774519,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1734875076, "lastModified": 1737165118,
"narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1807c2b91223227ad5599d7067a61665c52d1295", "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736203741, "lastModified": 1737107480,
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1734207213, "lastModified": 1737161836,
"narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", "narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", "rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf",
"revCount": 869, "revCount": 901,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

15
flake.nix
View file

@ -28,14 +28,11 @@
outputs = { outputs = {
nixpkgs, nixpkgs,
nixpkgs-stable,
home-manager, home-manager,
flake-programs-sqlite,
... ...
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
in in
with builtins; with builtins;
with nixpkgs.lib.attrsets; { with nixpkgs.lib.attrsets; {
@ -43,11 +40,7 @@
name = host; name = host;
value = nixpkgs.lib.nixosSystem { value = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {inherit inputs;};
inherit pkgs-stable;
inherit flake-programs-sqlite;
inherit inputs;
};
modules = [(./hosts + "/${host}")]; modules = [(./hosts + "/${host}")];
}; };
}) (readDir ./hosts); }) (readDir ./hosts);
@ -61,11 +54,7 @@
name = "${user}@${host}"; name = "${user}@${host}";
value = home-manager.lib.homeManagerConfiguration { value = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = { extraSpecialArgs = {inherit inputs;};
inherit pkgs-stable;
inherit (inputs) nix-gaming;
inherit inputs;
};
modules = [(users + "/${user}")]; modules = [(users + "/${user}")];
}; };
}) (readDir users) }) (readDir users)

1
hosts/hyuganatsu/users/ahnwuoa/default.nix
View file

@ -10,4 +10,5 @@
home.username = "ahnwuoa"; home.username = "ahnwuoa";
u.has.activitywatch = true; u.has.activitywatch = true;
u.has.jp = true;
} }

4
hosts/hyuganatsu/users/u2h/default.nix
View file

@ -1,7 +1,7 @@
{ {
config, config,
pkgs, pkgs,
nix-gaming, inputs,
... ...
}: { }: {
imports = [ imports = [
@ -11,6 +11,6 @@
home.username = "u2h"; home.username = "u2h";
home.packages = [ home.packages = [
pkgs.opentabletdriver pkgs.opentabletdriver
nix-gaming.packages."x86_64-linux".osu-stable inputs.nix-gaming.packages."x86_64-linux".osu-stable
]; ];
} }

13
overlays/nsxiv.diff
View file

@ -40,16 +40,17 @@
Cursor icon; Cursor icon;
} cursors[CURSOR_COUNT] = { } cursors[CURSOR_COUNT] = {
- { XC_left_ptr }, - { XC_left_ptr },
+ { "left_ptr" }, + { { .name = "left_ptr" } },
{ XC_dotbox }, - { XC_dotbox },
+ { { .num = XC_dotbox } },
- { XC_fleur }, - { XC_fleur },
+ { "dnd-move" }, + { { .name = "dnd-move" } },
- { XC_watch }, - { XC_watch },
+ { "wait" }, + { { .name = "wait" } },
- { XC_sb_left_arrow }, - { XC_sb_left_arrow },
+ { "left-arrow" }, + { { .name = "left-arrow" } },
- { XC_sb_right_arrow } - { XC_sb_right_arrow }
+ { "right-arrow" } + { { .name = "right-arrow" } }
}; };
#if HAVE_LIBFONTS #if HAVE_LIBFONTS

4
system/configuration.nix
View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
lib, lib,
flake-programs-sqlite, inputs,
... ...
}: { }: {
nix.settings = { nix.settings = {
@ -41,7 +41,7 @@
environment.etc."ssh/ssh_config".text = lib.mkAfter "Include /home/*/.local/ssh/config"; environment.etc."ssh/ssh_config".text = lib.mkAfter "Include /home/*/.local/ssh/config";
programs.command-not-found.dbPath = flake-programs-sqlite.packages.${pkgs.system}.programs-sqlite; programs.command-not-found.dbPath = inputs.flake-programs-sqlite.packages.${pkgs.system}.programs-sqlite;
programs.ssh.enableAskPassword = false; programs.ssh.enableAskPassword = false;

3
user/autostart.nix
View file

@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgs-stable,
... ...
}: }:
lib.mkIf config.u.has.graphical { lib.mkIf config.u.has.graphical {
@ -25,7 +24,7 @@ lib.mkIf config.u.has.graphical {
copyq.Service.ExecStart = ["${pkgs.copyq}/bin/copyq"]; copyq.Service.ExecStart = ["${pkgs.copyq}/bin/copyq"];
fcitx5.Service.ExecStart = ["/run/current-system/sw/bin/fcitx5"]; fcitx5.Service.ExecStart = ["/run/current-system/sw/bin/fcitx5"];
picom.Service.ExecStart = ["${pkgs.picom}/bin/picom"]; picom.Service.ExecStart = ["${pkgs.picom}/bin/picom"];
safeeyes.Service.ExecStart = ["${pkgs-stable.safeeyes}/bin/safeeyes"]; safeeyes.Service.ExecStart = ["${pkgs.safeeyes}/bin/safeeyes"];
snixembed.Service.ExecStart = ["${pkgs.snixembed}/bin/snixembed"]; snixembed.Service.ExecStart = ["${pkgs.snixembed}/bin/snixembed"];
}; };
} }

2
user/config/bash/custom
View file

@ -13,7 +13,7 @@ if [[ "$parent" == *alacritty ]]; then
fi fi
# set shell level # set shell level
elif [[ "$parent" == "tmux" ]]; then elif [[ "$parent" == "tmux" ]]; then
export SHLVL=2 export SHLVL=1
fi fi
# default prompt command sets window title # default prompt command sets window title

3
user/packages.nix
View file

@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgs-stable,
... ...
}: { }: {
home.packages = with pkgs; home.packages = with pkgs;
@ -41,7 +40,7 @@
picom picom
obs-studio obs-studio
screenkey screenkey
pkgs-stable.safeeyes safeeyes
snixembed snixembed
libsForQt5.kolourpaint libsForQt5.kolourpaint
libsForQt5.filelight libsForQt5.filelight

2
user/prog.nix
View file

@ -16,8 +16,6 @@ lib.mkIf config.u.has.prog {
nodejs nodejs
deno deno
gnumake gnumake
coq
coqPackages.coqide
gcc gcc
gdb gdb
pwndbg pwndbg