From 8193868878ce1c18698ef47cac5c16b12d74f3ab Mon Sep 17 00:00:00 2001 From: caandt Date: Sun, 19 Jan 2025 10:24:18 -0600 Subject: [PATCH] version bump --- flake.lock | 64 +++++++++++----------- flake.nix | 15 +---- hosts/hyuganatsu/users/ahnwuoa/default.nix | 1 + hosts/hyuganatsu/users/u2h/default.nix | 4 +- overlays/nsxiv.diff | 13 +++-- system/configuration.nix | 4 +- user/autostart.nix | 3 +- user/config/bash/custom | 2 +- user/packages.nix | 3 +- user/prog.nix | 2 - 10 files changed, 49 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index 271a4ed..a21c4d7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734088167, - "narHash": "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=", + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", "owner": "nix-community", "repo": "disko", - "rev": "65a441502c9382d41ada1adbc9bd31d6c9b00fe2", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1735066341, - "narHash": "sha256-CWWyjOgIMv08M/WScUL1Dvd3cFTSMLJEXyHlArsJ2ZI=", + "lastModified": 1737246960, + "narHash": "sha256-AsHD6Vfxx4R3FavTj0fZffhWKvg7xbUM1lNM1rryhiU=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "832b4e206b87761d5e46fb0ff4df8c13dac93fde", + "rev": "2ae6ed65904fc67517e265b59ed1df9e7ee9e2e4", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1735090720, - "narHash": "sha256-Abx/6obaYLgFio8g06pcmMaRPwjKo/bOn1P+gsDMVg0=", + "lastModified": 1737250748, + "narHash": "sha256-dfmZxGmmwyYPVQCNI0IOOi5R7uFLAK0eHpjKhtntXcE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "95f1cc7ebe63b5a5af6c2d206ffd422739c5959e", + "rev": "bcc7d7ccdc82e63ab261ddea67e1db1d6091c35a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -120,23 +120,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1736203741, - "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", + "lastModified": 1737107480, + "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", + "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1734207213, - "narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", + "lastModified": 1737161836, + "narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=", "ref": "refs/heads/main", - "rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", - "revCount": 869, + "rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf", + "revCount": 901, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/flake.nix b/flake.nix index cc09b4c..b91fc66 100644 --- a/flake.nix +++ b/flake.nix @@ -28,14 +28,11 @@ outputs = { nixpkgs, - nixpkgs-stable, home-manager, - flake-programs-sqlite, ... } @ inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - pkgs-stable = nixpkgs-stable.legacyPackages.${system}; in with builtins; with nixpkgs.lib.attrsets; { @@ -43,11 +40,7 @@ name = host; value = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { - inherit pkgs-stable; - inherit flake-programs-sqlite; - inherit inputs; - }; + specialArgs = {inherit inputs;}; modules = [(./hosts + "/${host}")]; }; }) (readDir ./hosts); @@ -61,11 +54,7 @@ name = "${user}@${host}"; value = home-manager.lib.homeManagerConfiguration { inherit pkgs; - extraSpecialArgs = { - inherit pkgs-stable; - inherit (inputs) nix-gaming; - inherit inputs; - }; + extraSpecialArgs = {inherit inputs;}; modules = [(users + "/${user}")]; }; }) (readDir users) diff --git a/hosts/hyuganatsu/users/ahnwuoa/default.nix b/hosts/hyuganatsu/users/ahnwuoa/default.nix index 066ef21..b07e212 100644 --- a/hosts/hyuganatsu/users/ahnwuoa/default.nix +++ b/hosts/hyuganatsu/users/ahnwuoa/default.nix @@ -10,4 +10,5 @@ home.username = "ahnwuoa"; u.has.activitywatch = true; + u.has.jp = true; } diff --git a/hosts/hyuganatsu/users/u2h/default.nix b/hosts/hyuganatsu/users/u2h/default.nix index c65d94d..7c12733 100644 --- a/hosts/hyuganatsu/users/u2h/default.nix +++ b/hosts/hyuganatsu/users/u2h/default.nix @@ -1,7 +1,7 @@ { config, pkgs, - nix-gaming, + inputs, ... }: { imports = [ @@ -11,6 +11,6 @@ home.username = "u2h"; home.packages = [ pkgs.opentabletdriver - nix-gaming.packages."x86_64-linux".osu-stable + inputs.nix-gaming.packages."x86_64-linux".osu-stable ]; } diff --git a/overlays/nsxiv.diff b/overlays/nsxiv.diff index 83b4741..96b1806 100644 --- a/overlays/nsxiv.diff +++ b/overlays/nsxiv.diff @@ -40,16 +40,17 @@ Cursor icon; } cursors[CURSOR_COUNT] = { - { XC_left_ptr }, -+ { "left_ptr" }, - { XC_dotbox }, ++ { { .name = "left_ptr" } }, +- { XC_dotbox }, ++ { { .num = XC_dotbox } }, - { XC_fleur }, -+ { "dnd-move" }, ++ { { .name = "dnd-move" } }, - { XC_watch }, -+ { "wait" }, ++ { { .name = "wait" } }, - { XC_sb_left_arrow }, -+ { "left-arrow" }, ++ { { .name = "left-arrow" } }, - { XC_sb_right_arrow } -+ { "right-arrow" } ++ { { .name = "right-arrow" } } }; #if HAVE_LIBFONTS diff --git a/system/configuration.nix b/system/configuration.nix index a8b5c03..320f0a7 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -2,7 +2,7 @@ config, pkgs, lib, - flake-programs-sqlite, + inputs, ... }: { nix.settings = { @@ -41,7 +41,7 @@ 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; diff --git a/user/autostart.nix b/user/autostart.nix index 71afe48..1782178 100644 --- a/user/autostart.nix +++ b/user/autostart.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - pkgs-stable, ... }: lib.mkIf config.u.has.graphical { @@ -25,7 +24,7 @@ lib.mkIf config.u.has.graphical { copyq.Service.ExecStart = ["${pkgs.copyq}/bin/copyq"]; fcitx5.Service.ExecStart = ["/run/current-system/sw/bin/fcitx5"]; 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"]; }; } diff --git a/user/config/bash/custom b/user/config/bash/custom index 630dcbb..6efe8c8 100644 --- a/user/config/bash/custom +++ b/user/config/bash/custom @@ -13,7 +13,7 @@ if [[ "$parent" == *alacritty ]]; then fi # set shell level elif [[ "$parent" == "tmux" ]]; then - export SHLVL=2 + export SHLVL=1 fi # default prompt command sets window title diff --git a/user/packages.nix b/user/packages.nix index abcb4f0..0679333 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - pkgs-stable, ... }: { home.packages = with pkgs; @@ -41,7 +40,7 @@ picom obs-studio screenkey - pkgs-stable.safeeyes + safeeyes snixembed libsForQt5.kolourpaint libsForQt5.filelight diff --git a/user/prog.nix b/user/prog.nix index cd6ac49..b89d357 100644 --- a/user/prog.nix +++ b/user/prog.nix @@ -16,8 +16,6 @@ lib.mkIf config.u.has.prog { nodejs deno gnumake - coq - coqPackages.coqide gcc gdb pwndbg