From c7a0c8f7b66bdb6257798ea52b2bd21e9ce69a26 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 11 Nov 2025 18:11:23 +0800 Subject: [PATCH 1/8] feat: Enhance vim options --- pkgs/vim'/vimrc.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/vim'/vimrc.vim b/pkgs/vim'/vimrc.vim index 93c5e9d..e79ce48 100644 --- a/pkgs/vim'/vimrc.vim +++ b/pkgs/vim'/vimrc.vim @@ -64,3 +64,7 @@ set wildmenu set wildmode=full set wildoptions=fuzzy,pum set wrap + +map gh 0 +map gl $ +map gs ^ From 1d304a15bd58e90e11dd47153751f6eb351d963f Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 11 Nov 2025 18:11:23 +0800 Subject: [PATCH 2/8] feat: Add sunshie module for Tytonidae --- nixos/configurations/Tytonidae/default.nix | 1 + nixos/modules/programs/sunshine.nix | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 nixos/modules/programs/sunshine.nix diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 303895e..1ad9914 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -50,6 +50,7 @@ obs.enable = true; garage.enable = true; # emacs.enable = true; + sunshine.enable = true; }; }; diff --git a/nixos/modules/programs/sunshine.nix b/nixos/modules/programs/sunshine.nix new file mode 100644 index 0000000..76614f6 --- /dev/null +++ b/nixos/modules/programs/sunshine.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + ... +}: let + cfg = config.youthlic.programs.sunshine; +in { + options = { + youthlic.programs.sunshine = { + enable = lib.mkEnableOption "sunsine"; + }; + }; + config = lib.mkIf cfg.enable { + services.sunshine = { + enable = true; + autoStart = true; + capSysAdmin = true; + # settings = {}; + openFirewall = true; + # applications = {}; + }; + }; +} From 1078f489ff12dada0184ac135d10a80255c3fb9d Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 11 Nov 2025 18:11:23 +0800 Subject: [PATCH 3/8] feat: Add zen-browser module for Tytonidae --- flake.lock | 26 +- flake.nix | 9 + .../configurations/Tytonidae/default.nix | 1 + home/david/modules/programs/zen-browser.nix | 229 ++++++++++++++++++ home/modules/default.nix | 1 + 5 files changed, 265 insertions(+), 1 deletion(-) create mode 100644 home/david/modules/programs/zen-browser.nix diff --git a/flake.lock b/flake.lock index dab0030..61740fe 100644 --- a/flake.lock +++ b/flake.lock @@ -1372,7 +1372,8 @@ "sops-nix": "sops-nix", "spacemacs": "spacemacs", "stylix": "stylix", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix", + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -1761,6 +1762,29 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "zen-browser": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763616019, + "narHash": "sha256-yCNgkYovgIpOZankp38BxKFISmdc2b34vtEuVuxhTuk=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "a0a29968bccb2f118b33360697d5cc5fdae30cfa", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 15fabc8..907e7cf 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,15 @@ nixpkgs.follows = "nixpkgs"; }; }; + zen-browser = { + type = "github"; + owner = "0xc000022070"; + repo = "zen-browser-flake"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; niri-flake = { type = "github"; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index d9662cb..fa709d1 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -51,6 +51,7 @@ alacritty.enable = true; zed-editor.enable = true; firefox.enable = true; + zen-browser.enable = true; openssh.enable = true; helix.enable = true; nvchad.enable = true; diff --git a/home/david/modules/programs/zen-browser.nix b/home/david/modules/programs/zen-browser.nix new file mode 100644 index 0000000..5e4d21f --- /dev/null +++ b/home/david/modules/programs/zen-browser.nix @@ -0,0 +1,229 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.david.programs.zen-browser; +in { + options = { + david.programs.zen-browser = { + enable = lib.mkEnableOption "zen-browser"; + }; + }; + config = lib.mkIf cfg.enable { + programs.zen-browser = { + enable = true; + profiles.default = { + name = "default"; + isDefault = true; + extensions = { + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + immersive-translate + tridactyl + redirector + ]; + }; + search = { + force = true; + default = "ddg"; + engines = { + "Guix Packages" = { + urls = [ + { + template = "https://packages.guix.gnu.org/search/"; + params = [ + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@gp"]; + }; + "Nix Packages" = { + urls = [ + { + template = "https://search.nixos.org/packages"; + params = [ + { + name = "type"; + value = "packages"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = ["@np"]; + }; + "Nix Options" = { + urls = [ + { + template = "https://search.nixos.org/options"; + params = [ + { + name = "channel"; + value = "unstable"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@no"]; + }; + "Home Manager Options" = { + urls = [ + { + template = "https://home-manager-options.extranix.com"; + params = [ + { + name = "query"; + value = "{searchTerms}"; + } + { + name = "release"; + value = "master"; + } + ]; + } + ]; + definedAliases = ["@hm"]; + }; + "Nix Flakes" = { + urls = [ + { + template = "https://search.nixos.org/flakes"; + params = [ + { + name = "channel"; + value = "unstable"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@nf"]; + }; + "NixOS Wiki" = { + urls = [ + { + template = "https://wiki.nixos.org/w/index.php"; + params = [ + { + name = "search"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@nw"]; + }; + "Rust Stdandard Lib" = { + urls = [ + { + template = "https://doc.rust-lang.org/nightly/std/index.html"; + params = [ + { + name = "search"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@rs"]; + }; + "GitHub" = { + urls = [ + { + template = "https://github.com/search"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + { + name = "type"; + value = "repositories"; + } + ]; + } + ]; + definedAliases = ["@gh"]; + }; + "Rust Reference" = { + urls = [ + { + template = "https://doc.rust-lang.org/nightly/reference"; + params = [ + { + name = "search"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@rr"]; + }; + "Rust Crates" = { + urls = [ + { + temaplte = "https://crates.io/search"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; + definedAliases = ["@rc"]; + }; + "C++ Reference" = { + urls = [ + { + template = "https://duckduckgo.com/"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + { + name = "sites"; + value = "cppreference.com"; + } + ]; + } + ]; + definedAliases = ["@cr"]; + }; + "bing".metaData.hidden = true; + "google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias + }; + }; + }; + policies = { + DisableAppUpdate = true; + Preferences = let + mkLockedAttrs = builtins.mapAttrs (_: value: { + Value = value; + Status = "locked"; + }); + in + mkLockedAttrs { + "browser.tabs.closeTabByDblclick" = true; + }; + }; + }; + }; +} diff --git a/home/modules/default.nix b/home/modules/default.nix index 5f2bbef..53d02e7 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,6 +9,7 @@ betterfox-nix.homeModules.betterfox nix4nvchad.homeManagerModule noctalia.homeModules.default + zen-browser.homeModules.twilight ]) ++ lib.youthlic.loadImports ./.; From b4e11a6fd3789e4c560e196dffc95bb3719c2f26 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Nov 2025 14:54:45 +0800 Subject: [PATCH 4/8] feat: Remove README.org --- README.org | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 README.org diff --git a/README.org b/README.org deleted file mode 100644 index a498e3f..0000000 --- a/README.org +++ /dev/null @@ -1,46 +0,0 @@ -* NixoS / Home-manageR ConfiguratioN - -Hey, you. This is my nixos configurations. - ------ - -| Machine | Users | OS | -|-----------+-------+-------| -| Tytonidae | david | NixOS | -| Akun | david | NixOS | -| Cape | alice | NixOS | ------ - -- david@Tytonidae - - | Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | - |----------------+---------+-------------+-------------+----------+----------+---------+------------------| - | default | niri | fish + bash | helix + zed | ghostty | fuzzel | firefox | greetd + regreet | - | kde | kde | fish + bash | helix + zed | ghostty | kde run | firefox | sddm | - -- david@Akun - - | Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | - |----------------+---------+-------------+-------------+----------+----------+---------+------------------| - | default | niri | fish + bash | helix + zed | ghostty | fuzzel | firefox | greetd + regreet | - -- alice@Cape - - | Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | - |----------------+---------+-------------+--------+----------+----------+---------+----| - | default | - | fish + bash | helix | - | - | - | - | - -** FlakE OutputS and StructurE - -| =outputs= field | description | source | -|-------------------------------------------+-----------------------------------------------------------------------------+------------------------------------------| -| =packages= | packages imported or wrapped from elsewhere | ./pkgs | -| =lib= | patched nixpkgs.lib to include self-defined helper function | ./lib | -| =overlays.modifications= | the overlays modify == | ./overlays/modifications | -| =overlays.additions= | the ovelrays add packages in == | ./overlays/additions | -| =nixosModules.default= | nixos modules shared on different nixos machines | ./nixos/modules | -| =nixosConfigurations.${machine}= | machine-local nixos config | ./nixos/configurations/${machine} | -| =homeModules.default= | home-manager modules shared between different user and machine combinations | ./home/modules | -| =homeModules.extra= | home-manager modules only for non-nixos | ./home/extra | -| =homeModules.${user}= | home-manager modules shared between different users | ./home/${user}/modules | -| =homeConfigurations."${user}@${machine}"= | home-manager config for different user and machine combinations | ./home/${user}/configurations/${machine} | From a27398dc8efa457997a081b1f3c87749e4d3fec1 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Nov 2025 14:54:45 +0800 Subject: [PATCH 5/8] feat: Set zen-browser as default browser and add keybind for it --- README.md | 8 ++--- home/david/modules/programs/niri/config.nix | 6 +++- nixos/modules/gui/niri.nix | 38 +++++++-------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index ec79101..8ab1366 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ Hey, you. This is my nixos configurations. - david@Tytonidae -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| :------------: | :-----: | :---------: | :---------: | :------: | :------: | :-----: | :--------------: | -| default | niri | fish + bash | helix + zed | ghostty | fuzzel | firefox | greetd + regreet | -| kde | kde | fish + bash | helix + zed | ghostty | kde run | firefox | sddm | +| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | +| :------------: | :-----: | :---------: | :---------: | :------: | :------: | :---------: | :--------------: | +| default | niri | fish + bash | helix + zed | ghostty | fuzzel | zen-browser | greetd + regreet | +| kde | kde | fish + bash | helix + zed | ghostty | kde run | firefox | sddm | - david@Akun diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index f038743..42f6cd1 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -6,7 +6,7 @@ }: { config.david.programs.niri.config = let - inherit (lib) getExe; + inherit (lib) getExe getExe'; inherit (inputs.niri-flake.lib.kdl) # node with args, props and children @@ -34,6 +34,7 @@ # wpctl = getExe' pkgs.wireplumber "wpctl"; # waypaper = getExe pkgs.waypaper; default-terminal = getExe config.programs.ghostty.package; + default-browser = getExe' config.programs.zen-browser.package "zen"; # wl-paste = getExe' pkgs.wl-clipboard "wl-paste"; # cliphist = getExe' pkgs.cliphist "cliphist"; # cliphist-fuzzel-img = getExe' pkgs.cliphist "cliphist-fuzzel-img"; @@ -67,6 +68,9 @@ # "0.5" # ]) # ]) + (plain "Mod+B" [ + (spawn [default-browser]) + ]) (plain "Mod+Shift+Slash" [ (flag "show-hotkey-overlay") ]) diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index c9893ec..e2c6789 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -41,7 +41,12 @@ in { default = ["com.mitchellh.ghostty.desktop"]; }; }; - mime = { + mime = let + browsers = [ + "zen-twilight.desktop" + "chromium-browser.desktop" + ]; + in { enable = true; defaultApplications = { "application/pdf" = [ @@ -50,31 +55,14 @@ in { "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; - "x-scheme-handler/about" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; - "x-scheme-handler/ftp" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; - "x-scheme-handler/http" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; - "x-scheme-handler/https" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; - "x-scheme-handler/mailto" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; + "text/html" = browsers; + "x-scheme-handler/about" = browsers; + "x-scheme-handler/ftp" = browsers; + "x-scheme-handler/http" = browsers; + "x-scheme-handler/https" = browsers; + "x-scheme-handler/mailto" = browsers; "x-scheme-handler/tg" = ["telegramdesktop.desktop"]; - "x-scheme-handler/unknown" = [ - "firefox-beta.desktop" - "chromium-browser.desktop" - ]; + "x-scheme-handler/unknown" = browsers; "image/gif" = [ "swayimg.desktop" ]; From 72971ea1ef25a2f06adc4e33cc25721d8fd140d3 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Nov 2025 14:54:45 +0800 Subject: [PATCH 6/8] fix: Fix typo in url --- home/david/modules/programs/zen-browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/david/modules/programs/zen-browser.nix b/home/david/modules/programs/zen-browser.nix index 5e4d21f..dc5a958 100644 --- a/home/david/modules/programs/zen-browser.nix +++ b/home/david/modules/programs/zen-browser.nix @@ -178,7 +178,7 @@ in { "Rust Crates" = { urls = [ { - temaplte = "https://crates.io/search"; + template = "https://crates.io/search"; params = [ { name = "q"; From a8a376787aa4cd678025406b23e649a50da94a2c Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 24 Nov 2025 13:06:20 +0800 Subject: [PATCH 7/8] chore: Remove unused juicity upstream fetcher --- nvfetcher.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nvfetcher.toml b/nvfetcher.toml index 345ab71..71d708a 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,7 +1,3 @@ -[juicity] -fetch.git = "https://githuh.com/juicity/juicity" -src.git = "https://github.com/juicity/juicity" - [tree-sitter-idris] fetch.git = "https://github.com/kayhide/tree-sitter-idris" passthru.name = "idris" From 9556ca8d50ca3d395236fba41d937e1b40219887 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 24 Nov 2025 13:06:20 +0800 Subject: [PATCH 8/8] chore: Update flake inputs --- flake.lock | 309 +++++++++++------------ flake.nix | 8 +- home/david/modules/programs/noctalia.nix | 2 +- nixos/modules/nix.nix | 1 + pkgs/doom-emacs/package.nix | 2 +- 5 files changed, 147 insertions(+), 175 deletions(-) diff --git a/flake.lock b/flake.lock index 61740fe..40e6891 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762735459, - "narHash": "sha256-VZRCyMRSLFORBzH+pYzDSx/ooIBD5Ohrv28sWktSiqk=", + "lastModified": 1763946419, + "narHash": "sha256-bcgbx3Ps7dL9hE+op6OSMVAMkXcidZHVNsFuBKbCy0w=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "37ac3490a7e2825985ce5c0004489b2264ea1cd0", + "rev": "9c394344f04e0bb89eeeb1ed36917e1dbfa59bab", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763246168, - "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=", + "lastModified": 1763959276, + "narHash": "sha256-QJYTBOOGUy9HfPVvjY3sLwFgqNqcx6l7Ho9CnOV1jeM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6476fbdd52621b4a532309d982d468dc08204151", + "rev": "9da2c2a35bd0c1dfcc4f7a32d62189d2e37cb1d7", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1763310170, - "narHash": "sha256-XFB1UvfWL9JgJqBKicGe2f8+cW7zh1yMcgKof8dGlvw=", + "lastModified": 1763977942, + "narHash": "sha256-Dhi5xNbhZI/GNKgxun7ckVCwLYepuWwMIPn8dYFJl0E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d33a3fae28a7f2c8ab0b6bdfd929eb73692ce06a", + "rev": "f87351a238ddda570226360a8e0725fc2d75f273", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1763281507, - "narHash": "sha256-cSwgQxlLUTkw2Sdtgh/extCGIAELJCZN+Vb+9G02MIM=", + "lastModified": 1763973050, + "narHash": "sha256-g0szh6HO7TogmtCKfbHi8dlMPWqvm7aiyc63wtL0FWc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "70fa92384ef398a4b4b5002c6caac08b1e01dd87", + "rev": "ec7f997a2ec8fab1b842e3b40df9fc9e55465909", "type": "github" }, "original": { @@ -286,11 +286,11 @@ ] }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -364,11 +364,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -565,11 +565,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763309322, - "narHash": "sha256-2M6D/i0Poh529SovRSsM+m9sYqfl9GNMmDW4efKvh/4=", + "lastModified": 1763839772, + "narHash": "sha256-R692DLhMzPmqyo1IDAanJoc4LDOQSZkbkh0nNt7dXPY=", "owner": "helix-editor", "repo": "helix", - "rev": "d966e12930d4ea0093708457bde0951aa77660ec", + "rev": "095227ef2f0308b097f981facc745fae77949c81", "type": "github" }, "original": { @@ -587,11 +587,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763869804, + "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1763313531, - "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", + "lastModified": 1763963090, + "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", + "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "import-tree": { "locked": { - "lastModified": 1762327901, - "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=", + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", "owner": "vic", "repo": "import-tree", - "rev": "90fa129798be99cde036b78658e89475710966a1", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", "type": "github" }, "original": { @@ -672,11 +672,11 @@ ] }, "locked": { - "lastModified": 1762951919, - "narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=", + "lastModified": 1763714684, + "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3d248f6e8f877218dd2573fef8925ac997889922", + "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1759940703, - "narHash": "sha256-/dXDCzYnQbkqCsvUDIxgIH4BS/fyxIu73m2v4ftJLXQ=", - "rev": "75c03142049242a5687309e59e4f356fbc92789a", + "lastModified": 1753306924, + "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=", + "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/75c03142049242a5687309e59e4f356fbc92789a.tar.gz?rev=75c03142049242a5687309e59e4f356fbc92789a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77" }, "original": { "type": "tarball", @@ -756,11 +756,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1763337828, - "narHash": "sha256-gBf/sNC/u0EztJybm7yP0OfbEKyN3WVi7J7FLbpswX0=", + "lastModified": 1763942693, + "narHash": "sha256-DvAkXPkSfgColZZ2sBbBl69CxzamyH7Hmi4qVUTP1OU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "227971b938a6d83e3b839e5f11991511374020b7", + "rev": "da647c7ac355d4f8be218ff0466bee9b5c6680ed", "type": "github" }, "original": { @@ -772,11 +772,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1763328107, - "narHash": "sha256-N+Al++BfSq1/JZE3LY1DrefnO+kXm3y1OcqOnKrBGJQ=", + "lastModified": 1763931717, + "narHash": "sha256-juqY16KziaFTk4D0Vx06tUlYLiEc6vMlEtjDLIjGn0Q=", "owner": "neovim", "repo": "neovim", - "rev": "f0294418d65d005d885eabf80eecc7255358b95e", + "rev": "a88c7962a82f1427aa90d1c0a08514423516f9f2", "type": "github" }, "original": { @@ -797,11 +797,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763325933, - "narHash": "sha256-9liktF34Fu8wT3V5wG736RuaAT6+W8jYkf32kbNSm8s=", + "lastModified": 1763967518, + "narHash": "sha256-Gt0QlWp3r5JF+w2iZMbbot58UIR66fPH8LuHRxmHjsA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "be1983b9b9359241a202eb3ec4f2c966f5bebe5b", + "rev": "69c6216ddacf8a708e4c6e51273772226fab3bc2", "type": "github" }, "original": { @@ -830,11 +830,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763321761, - "narHash": "sha256-7M81UIShdVH2AtMonx7+Hh8EL5dpP9Pa/0YLZMNrd7A=", + "lastModified": 1763964256, + "narHash": "sha256-TNtOfYXppR5ln5Go8ncQFMs5+xa3LqJWkaQq22ymAcI=", "owner": "YaLTeR", "repo": "niri", - "rev": "aecbd679e39a321495964995fa1e37d84bd91ddf", + "rev": "79e41d7d88de44356b48400515076bf5593544e8", "type": "github" }, "original": { @@ -853,11 +853,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1763282415, - "narHash": "sha256-Blb9l3DjFXjhYOqR7RoA/TQUS7BnBN4VufpRvG4XSlo=", + "lastModified": 1763980357, + "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "b04d4b93dc60bc586224b28564b116f0692ce05c", + "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c", "type": "github" }, "original": { @@ -872,11 +872,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1763313066, - "narHash": "sha256-i2s3jPiMRPLd1mcL0oNMSbrbmq9ba/Qo4YPVPehPmEs=", + "lastModified": 1763949820, + "narHash": "sha256-nN+Ebv2czqqMFIpH1/VfrjoaHzZTxTE/diuLhw1HqPQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dfa5f946fe41f085e34159a818790f69a19a0022", + "rev": "faa39649d0ad7e11bfcb7887ccda478515e489e8", "type": "github" }, "original": { @@ -919,11 +919,11 @@ ] }, "locked": { - "lastModified": 1763090138, - "narHash": "sha256-7h9pE4Sm/gk3KSa0N/kTSm3Jr3VSriKhCzWe94r9nRE=", + "lastModified": 1763694739, + "narHash": "sha256-zpT3XysPItqHuYvygFfC8ASzKNGExARZCrfDQUul1v4=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "856b909046ad6f07e8337736ecf3702460be2b0f", + "rev": "713a3693da4832c169aa90e8cae6e7a45b8c7949", "type": "github" }, "original": { @@ -950,11 +950,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -964,6 +964,22 @@ "type": "github" } }, + "nixpkgs-fix-awscli2": { + "locked": { + "lastModified": 1763992412, + "narHash": "sha256-XFwKTAj3tgCTtaalfxhOtRcQbnW6+nO7uvWvGharCrI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4eb7329cba579c016e018a5e5dc9fea9cc8ee190", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1761765539, @@ -996,11 +1012,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -1012,11 +1028,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -1044,11 +1060,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -1092,11 +1108,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763806073, + "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "878e468e02bfabeda08c79250f7ad583037f2227", "type": "github" }, "original": { @@ -1108,11 +1124,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -1124,11 +1140,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -1140,11 +1156,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -1156,11 +1172,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -1178,11 +1194,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1763334942, - "narHash": "sha256-ORaewCyY3Fff+XaGrRjWi0XYzC22YTr/H3oL9c9k+9I=", + "lastModified": 1763984728, + "narHash": "sha256-i07UsSg+kedev5Bh/p/ERG1xrbRivOztih8laHZR6W8=", "owner": "nix-community", "repo": "nixvim", - "rev": "59af09b1814538b826f30eac8024d126d8c36efc", + "rev": "3dc952d69cd38cdc3ad3ec7570fc4a1caed2bfea", "type": "github" }, "original": { @@ -1195,18 +1211,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "quickshell": [ - "quickshell" - ], - "systems": "systems_7" + ] }, "locked": { - "lastModified": 1763340051, - "narHash": "sha256-S/H0WShZXqxxZw2K6vtylHoxhGIz2+0bOJ6C+05151Q=", + "lastModified": 1763989982, + "narHash": "sha256-fUC13I7HJ6E0+KzkLMD34EpvKopqdwAk2jd31L65AyM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "df3751108916054b61c450a46ee3310c4c2908a4", + "rev": "c7116827a4f58dc9f59f5e80f72466774a7c0ca3", "type": "github" }, "original": { @@ -1221,11 +1233,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1763342013, - "narHash": "sha256-MJZthRbFMeXMLXLVIekUo17G81G4rwIbsBLRotKaNAc=", + "lastModified": 1763987906, + "narHash": "sha256-KWbfekGOnXBxcvrq0nl3R51jyN+6kVjIbr7m00KvO9c=", "owner": "nix-community", "repo": "NUR", - "rev": "293f62dfaaf6fc2861e73aafde9fdb7b83e5bd4a", + "rev": "ddb9f3d65e7d72ecf823b4546dddfc4dc515a5c8", "type": "github" }, "original": { @@ -1324,26 +1336,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763257314, - "narHash": "sha256-R7HJSluErPrCQk+VXNWJrE2Pjq582VRNWDHAk6j6wQI=", - "owner": "outfoxxed", - "repo": "quickshell", - "rev": "fdbb86a06acd6d1af6049a319c87a5c0badc22dc", - "type": "github" - }, - "original": { - "owner": "outfoxxed", - "repo": "quickshell", - "type": "github" - } - }, "root": { "inputs": { "betterfox-nix": "betterfox-nix", @@ -1364,11 +1356,11 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_7", + "nixpkgs-fix-awscli2": "nixpkgs-fix-awscli2", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", "nvchad-starter": "nvchad-starter", - "quickshell": "quickshell", "sops-nix": "sops-nix", "spacemacs": "spacemacs", "stylix": "stylix", @@ -1384,11 +1376,11 @@ ] }, "locked": { - "lastModified": 1763087910, - "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", + "lastModified": 1763865987, + "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf4a68749733d45c0420726596367acd708eb2e8", + "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", "type": "github" }, "original": { @@ -1446,11 +1438,11 @@ ] }, "locked": { - "lastModified": 1763264763, - "narHash": "sha256-N0BEoJIlJ+M6sWZJ8nnfAjGY9VLvM6MXMitRenmhBkY=", + "lastModified": 1763870012, + "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "882e56c8293e44d57d882b800a82f8b2ee7a858f", + "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "type": "github" }, "original": { @@ -1462,11 +1454,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1763284982, - "narHash": "sha256-VjgvKvCgO3wHutai2q+KUpXMTrGXQI+IPUU4ziMK3IM=", + "lastModified": 1763929057, + "narHash": "sha256-W9n1G1Uv0bKN/5sO4j7bfjopqJQaU7XgRXRaLrZKNc8=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "4db5cc732c4da5a65366fc2d585d315363a7a6da", + "rev": "26043e8d14815fadd20ea9a409b4824e1b9198c4", "type": "github" }, "original": { @@ -1490,7 +1482,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_8", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1498,11 +1490,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763314990, - "narHash": "sha256-gs98KFE3X2HQ64gsIpQNsj1lKFTdkNdX+1KMQTDXEus=", + "lastModified": 1763845141, + "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", "owner": "nix-community", "repo": "stylix", - "rev": "b68e8220689a6f0393204b07be1bc14bb973a0ed", + "rev": "adc650610085adbe130b9860d5bdb869f96050af", "type": "github" }, "original": { @@ -1616,21 +1608,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1750,11 +1727,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1763704521, + "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "type": "github" }, "original": { @@ -1773,11 +1750,11 @@ ] }, "locked": { - "lastModified": 1763616019, - "narHash": "sha256-yCNgkYovgIpOZankp38BxKFISmdc2b34vtEuVuxhTuk=", + "lastModified": 1763958868, + "narHash": "sha256-IOP3fAjawH68FL1RDakySNRK6XNYdZajX538Q3U58Y0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a0a29968bccb2f118b33360697d5cc5fdae30cfa", + "rev": "15db6bda557066f3525010209bde4ec5f968f2ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 907e7cf..5b20f09 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs-fix-awscli2.url = "github:NixOS/nixpkgs/master"; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; @@ -234,19 +235,12 @@ repo = "nix-gaming"; }; - quickshell = { - type = "github"; - owner = "outfoxxed"; - repo = "quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; noctalia = { type = "github"; owner = "noctalia-dev"; repo = "noctalia-shell"; inputs = { nixpkgs.follows = "nixpkgs"; - quickshell.follows = "quickshell"; }; }; }; diff --git a/home/david/modules/programs/noctalia.nix b/home/david/modules/programs/noctalia.nix index 15e83c4..769235a 100644 --- a/home/david/modules/programs/noctalia.nix +++ b/home/david/modules/programs/noctalia.nix @@ -131,7 +131,7 @@ in { }; colorSchemes = { generateTemplatesForPredefined = false; - predefineScheme = "Catppuccin"; + predefinedScheme = "Catppuccin"; schedulingMode = "location"; useWallpaperColors = false; darkMode = false; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index b80b30f..266e639 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -32,6 +32,7 @@ cudaSupport = false; ncclSupport = false; }; + awscli2 = inputs.nixpkgs-fix-awscli2.legacyPackages.${p.stdenv.hostPlatform.system}.awscli2; }; }; }; diff --git a/pkgs/doom-emacs/package.nix b/pkgs/doom-emacs/package.nix index 35defa6..b3a8a56 100644 --- a/pkgs/doom-emacs/package.nix +++ b/pkgs/doom-emacs/package.nix @@ -21,7 +21,7 @@ emacs = emacs; extraPackages = ep: with ep; [ - melpaPackages.telega + melpaStablePackages.telega melpaPackages.nixos-options melpaPackages.scroll-on-jump melpaPackages.org-modern