diff --git a/flake.lock b/flake.lock index 0e26238..0abf5d0 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766518114, - "narHash": "sha256-3zIOjIidbrHXTxEzjPVrwSd19Mwdfw58VvSnTWtlunc=", + "lastModified": 1770895252, + "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", "ref": "refs/heads/main", - "rev": "138c4ebdbe0c3eead5656373ea8837a5bd49c40b", - "revCount": 1329, + "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", + "revCount": 1331, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -123,6 +123,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -185,11 +206,11 @@ ] }, "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -210,11 +231,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768601625, - "narHash": "sha256-tQ+QHQ95BPSldBEU5SyxSW13yO3XRp87z+QPZmKUy+k=", + "lastModified": 1771292643, + "narHash": "sha256-9Nrc/obJ+ngpfpia3MBTuzhCF7yJJ+HDTJfwnf7Z32w=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "395c7aef5c8fcc39cfe8bbf235298be291d1325e", + "rev": "e386641cafb4501b68c8187909e0fbce9f36a102", "type": "github" }, "original": { @@ -243,11 +264,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768487377, - "narHash": "sha256-+WOpoDSvYJds8zCMlwDHKBivxSViM5n1J1Jo9Lcf19Y=", + "lastModified": 1771182017, + "narHash": "sha256-lrXBx91NQAVoFeFUNZi46ZWP9M6tbBmT5BNsqSh8QOY=", "owner": "YaLTeR", "repo": "niri", - "rev": "87e2dd0361172a48cb3ac8e5b3f6f701c758700d", + "rev": "1fa0338a172a69b05a1a35d55b291693ff1bc29f", "type": "github" }, "original": { @@ -258,11 +279,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768584846, - "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=", + "lastModified": 1771257191, + "narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440", + "rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f", "type": "github" }, "original": { @@ -274,11 +295,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -289,11 +310,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768323494, - "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", + "lastModified": 1771208521, + "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a", + "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", "type": "github" }, "original": { @@ -304,6 +325,27 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774710140, + "narHash": "sha256-xP2NtCnfHE/IdzFCroZ0nj8U9U3UydaO6aDICRXJdLc=", + "owner": "nix-community", + "repo": "NUR", + "rev": "3308e5c8056878bbd36679887ce3be23f6571875", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_2": { "inputs": { "flake-parts": [ "stylix", @@ -335,6 +377,7 @@ "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nur": "nur", "stylix": "stylix" } }, @@ -366,12 +409,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], - "nur": "nur", + "nur": "nur_2", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -380,11 +423,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768603455, - "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "danth", "repo": "stylix", - "rev": "590e5c68c4d5e8c766420473c0185d75113f653b", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { @@ -509,11 +552,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768106915, - "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", + "lastModified": 1771195969, + "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", + "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7af57b0..8e83210 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,10 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; stylix = { url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,7 +27,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = { self, nixpkgs, stylix, awww, niri, home-manager, nixos-hardware }@attrs: + outputs = { self, nixpkgs, nur, stylix, awww, niri, home-manager, nixos-hardware }@attrs: let system = "x86_64-linux"; make_besley = pkgs:(lib: (pkgs.stdenvNoCC.mkDerivation rec { @@ -49,7 +53,8 @@ })); #background = ./GitS_other_alley_zoom.png; #background = ./GitS_alley_to_water_zoom.png; - background = ./waneella/Destination_waneella.png; + #background = ./waneella/Destination_waneella.png; + background = ./waneella/Apr_05-21.png; homeManagerSharedModule = { home-manager.useGlobalPkgs = true; home-manager.users.nathan = ((import ./home-manager/home.nix) { username = "nathan"; homeDirectory = "/home/nathan"; backgroundImg = background; email = "miloignis@gmail.com"; }); @@ -218,6 +223,7 @@ specialArgs = attrs; modules = [ nixos-hardware.nixosModules.framework-13-7040-amd + nur.modules.nixos.default stylix.nixosModules.stylix niri.nixosModules.niri home-manager.nixosModules.home-manager @@ -281,6 +287,7 @@ inherit system; specialArgs = attrs; modules = [ + nur.modules.nixos.default stylix.nixosModules.stylix niri.nixosModules.niri home-manager.nixosModules.home-manager @@ -348,6 +355,7 @@ inherit system; specialArgs = attrs; modules = [ + nur.modules.nixos.default niri.nixosModules.niri home-manager.nixosModules.home-manager homeManagerSharedModule @@ -383,6 +391,7 @@ inherit system; specialArgs = attrs; modules = [ + nur.modules.nixos.default niri.nixosModules.niri home-manager.nixosModules.home-manager homeManagerSharedModule diff --git a/home-manager/home.nix b/home-manager/home.nix index 558989d..0850086 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -289,6 +289,51 @@ "Alt+Shift+P".action = power-off-monitors; }; }; + programs.firefox = { + enable = true; + profiles = let + shared = { + search = { + force = true; + default = "Kagi"; + engines = { + "Kagi" = { + urls = [ + { + template = "https://kagi.com/search?q={searchTerms}"; + } + ]; + }; + }; + }; + settings = { + extensions.autoDisableScopes = 0; + }; + extensions = { + force = true; + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + vimium + darkreader + bitwarden + ublock-origin + ]; + }; + }; + in { + default = shared // { + isDefault = true; + id = 0; + }; + st = shared // { + isDefault = false; + id = 1; + }; + }; + }; + stylix.targets.firefox = { + colorTheme.enable = true; + profileNames = [ "default" "st" ]; + }; programs.ghostty = { enable = true; @@ -406,6 +451,7 @@ programs.bash = { enable = true; sessionVariables = { + EDITOR = "vim"; }; profileExtra = '' if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer @@ -477,6 +523,9 @@ nnoremap :call ToggleHiddenAll() ''; }; + programs.zellij = { + enable = true; + }; programs.tmux = { enable = true; extraConfig = '' diff --git a/waneella/Apr_05-21.png b/waneella/Apr_05-21.png new file mode 100644 index 0000000..5714322 Binary files /dev/null and b/waneella/Apr_05-21.png differ