diff --git a/flake.lock b/flake.lock index dddea81..8cfa74b 100755 --- a/flake.lock +++ b/flake.lock @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1734656871, - "narHash": "sha256-SnAL5IMs8K35xrKJFBqVAHDomXTkveaXk7aftqglXcc=", + "lastModified": 1735070725, + "narHash": "sha256-NSKvAqkgOvf74Lxh5kUVV4pFYTPjdGRtuks7hgwczHo=", "owner": "nix-community", "repo": "NUR", - "rev": "646b957d7d1d1aef1e5b0d59ecbe2661a56722d9", + "rev": "2fb4eca072cf867a338f11016906345716519db1", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { diff --git a/home/modules/firefox/config/bookmarks/config/finances.nix b/home/modules/firefox/config/bookmarks/config/finances.nix index ddaa5ce..f076124 100755 --- a/home/modules/firefox/config/bookmarks/config/finances.nix +++ b/home/modules/firefox/config/bookmarks/config/finances.nix @@ -29,13 +29,13 @@ { name = "LiberaPay"; url = "https://liberapay.com/upRootNutrition"; - tags = ["libera" "liberapay" "donations" "bank" "banking" "money" "nutrivore"]; + tags = ["libera" "liberapay" "donations" "bank" "banking" "money" "uprootnutrition"]; keyword = "Libera"; } { name = "Patreon"; url = "https://www.patreon.com/upRootNutrition"; - tags = ["patreon" "donations" "bank" "banking" "money" "nutrivore"]; + tags = ["patreon" "donations" "bank" "banking" "money" "uprootnutrition"]; keyword = "Patreon"; } { @@ -46,7 +46,7 @@ } { name = "Shopify"; - url = "https://the-nutrivore.myshopify.com/admin"; + url = "https://uprootnutrition.myshopify.com/admin"; tags = ["shopify" "business" "shop" "bank" "banking" "money"]; keyword = "Shopify"; } @@ -77,7 +77,7 @@ { name = "Wix"; url = "https://manage.wix.com/dashboard/413fd74d-8a8f-4c77-bd91-9ea560ffe906/home"; - tags = ["wix" "website" "business" "bills" "nutrivore"]; + tags = ["wix" "website" "business" "bills" "uprootnutrition"]; keyword = "Wix"; } ]; diff --git a/home/modules/firefox/config/bookmarks/config/socialMedia.nix b/home/modules/firefox/config/bookmarks/config/socialMedia.nix index 2b43462..d204178 100755 --- a/home/modules/firefox/config/bookmarks/config/socialMedia.nix +++ b/home/modules/firefox/config/bookmarks/config/socialMedia.nix @@ -99,7 +99,7 @@ in { } { name = "X (Twitter)"; - url = "https://twitter.com/TheNutrivore"; + url = "https://x.com/upRootNutrition"; tags = ["twitter" "x" "social"]; keyword = "Twitter"; } diff --git a/home/modules/firefox/config/extensions/default.nix b/home/modules/firefox/config/extensions/default.nix index 78df43d..7404419 100755 --- a/home/modules/firefox/config/extensions/default.nix +++ b/home/modules/firefox/config/extensions/default.nix @@ -1,10 +1,9 @@ -{nur, ...}: { +{pkgs, ...}: { extensions = builtins.attrValues { inherit - (nur.repos.rycee.firefox-addons) + (pkgs.nur.repos.rycee.firefox-addons) bitwarden enhancer-for-youtube - localcdn sponsorblock ublock-origin unpaywall diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix index be624b9..8ccdba6 100755 --- a/home/modules/firefox/default.nix +++ b/home/modules/firefox/default.nix @@ -1,7 +1,6 @@ { pkgs, flake, - # nur, ... }: let inherit (flake.config.people) user0; @@ -18,7 +17,7 @@ in { id = 0; } // (import (configPath + /bookmarks) {inherit flake;}) - # // (import (configPath + /extensions) {inherit nur;}) + // (import (configPath + /extensions) {inherit pkgs;}) // (import (configPath + /search) {inherit flake;}) // (import (configPath + /settings)) // (import (configPath + /themes)); diff --git a/home/modules/vscode/config/extensions.nix b/home/modules/vscode/config/extensions.nix index c5863d7..5d8dcc7 100755 --- a/home/modules/vscode/config/extensions.nix +++ b/home/modules/vscode/config/extensions.nix @@ -1,17 +1,17 @@ {pkgs, ...}: { - extensions = builtins.attrValues { - inherit (pkgs.vscode-extensions.catppuccin) catppuccin-vsc; - inherit (pkgs.vscode-extensions.eamodio) gitlens; - inherit (pkgs.vscode-extensions.elmtooling) elm-ls-vscode; - inherit (pkgs.vscode-extensions.esbenp) prettier-vscode; - inherit (pkgs.vscode-extensions.haskell) haskell; - inherit (pkgs.vscode-extensions.james-yu) latex-workshop; - inherit (pkgs.vscode-extensions.jnoortheen) nix-ide; - inherit (pkgs.vscode-extensions.kamadorueda) alejandra; - inherit (pkgs.vscode-extensions.mattn) lisp; - inherit (pkgs.vscode-extensions.mkhl) direnv; - inherit (pkgs.vscode-extensions.pkief) material-icon-theme; - inherit (pkgs.vscode-extensions.streetsidesoftware) code-spell-checker; - inherit (pkgs.vscode-extensions.tamasfe) even-better-toml; - }; + extensions = with pkgs.vscode-extensions; [ + catppuccin.catppuccin-vsc + eamodio.gitlens + elmtooling.elm-ls-vscode + esbenp.prettier-vscode + haskell.haskell + james-yu.latex-workshop + jnoortheen.nix-ide + kamadorueda.alejandra + mattn.lisp + mkhl.direnv + pkief.material-icon-theme + streetsidesoftware.code-spell-checker + tamasfe.even-better-toml + ]; } diff --git a/home/modules/vscode/config/keybindings.nix b/home/modules/vscode/config/keybindings.nix index 21e17b0..9e31030 100755 --- a/home/modules/vscode/config/keybindings.nix +++ b/home/modules/vscode/config/keybindings.nix @@ -20,5 +20,10 @@ command = "editor.action.indentationToSpaces"; when = "textInputFocus"; } + { + key = "ctrl+shift+d"; + command = "editor.action.deleteLines"; + when = "textInputFocus"; + } ]; } diff --git a/nixos/default.nix b/nixos/default.nix index 4392b63..17b45e8 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -44,7 +44,6 @@ in { firejail flatpak fonts - nur plasma printing sddm diff --git a/nixos/modules/nur.nix b/nixos/modules/nur.nix deleted file mode 100755 index 928fdf5..0000000 --- a/nixos/modules/nur.nix +++ /dev/null @@ -1,7 +0,0 @@ -{config, ...}: { - home-manager = { - extraSpecialArgs = { - # inherit (config) nur; - }; - }; -} diff --git a/nixos/modules/services/upRootNutrition.nix b/nixos/modules/services/upRootNutrition.nix index b92aaff..c362b7b 100755 --- a/nixos/modules/services/upRootNutrition.nix +++ b/nixos/modules/services/upRootNutrition.nix @@ -1,7 +1,6 @@ {flake, ...}: let inherit (flake.config.services.instances) upRootNutrition web; service = upRootNutrition; - # localhost = web.localhost.address0; host = web.domains.url3; in { services = { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index d43ac41..bb48e76 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -10,7 +10,7 @@ network: mastodon-smtp: ENC[AES256_GCM,data:kGCckgG9vSZYJv/8Z9e58g==,iv:Jw9hDAtVe7LmPpdy/nN0JD9T6j8/OHcFcYiuOjQmJuc=,tag:VlGkBZE5kkzXPgZPw9o49A==,type:str] mastodon-database: ENC[AES256_GCM,data:qPOU8yGqEQWuMJ4E/fCc+vfKp+YZONb17ZIDHXYZ9RY=,iv:HzVd2ptZBtpRA/XA593WTNL3xJx97hvNx49zIZPBlhQ=,tag:KGZ7Mw2M5O9DBhB+fv+w1Q==,type:str] mastodon-redis: ENC[AES256_GCM,data:aEEOGmyLin80X1uNiLLIuCSGlGjYX9vOl45GuxwlJqE=,iv:3qaZAqwm6tLnB1vCtZ2ZotaZO4/XmQKLe/I+pzqbJj0=,tag:K1y1QoLgGRvi8oJrzcakhQ==,type:str] -peertube-smtp: ENC[AES256_GCM,data:SebXsDtI3B7IE2D/+cVBlA==,iv:dvUP/KRHtFcslOojuF+PhH/5sviIUFCQOU+lA62MooE=,tag:hqOVUL2XQb0P3FOBddLK6A==,type:str] +peertube-smtp: ENC[AES256_GCM,data:YBqlU0FQ2hveRSTU3iWygQ==,iv:lpmfylfOdZYGg6vwCkDO/OIFeW9+7L5xzTCfiqHUDkA=,tag:VwxWLLCMJEm3W/THP97Puw==,type:str] peertube-database: ENC[AES256_GCM,data:nm0bHwTcT+ROZc2BC9jx+tXWjZ3689rdn4fdYW+7JTU=,iv:EeQVBAIXPut9gs+I9WpRf7L3f7ACTeTWycUFIKAneKk=,tag:QjGQmZ3zMAgB/WDbxTZVIQ==,type:str] peertube-redis: ENC[AES256_GCM,data:SQoPzPjgf4YN9dhvO0wo2DEra7cTgfZBx4vCBpNVSXI=,iv:mcCwYtE9E/Mb4V0j9NnU9WhaUMeBpX7BOcc8HGDiEvI=,tag:CsSiS4peZhnZ22uNtUC44w==,type:str] peertube-root: ENC[AES256_GCM,data:BR0pmqEYYJuDqK7fstyW/hvh8V1GQXVHP24iz2eDeho500IbWaMuDxkNQyfInmIfjC3YvfsHME3S,iv:EgaLKBHYrklF+q5jBPvGKFYJosZxFFMXElTcyKU0ypQ=,tag:PztyBdK5OzeEDvQi/yqRIg==,type:str] @@ -48,8 +48,8 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-27T18:54:54Z" - mac: ENC[AES256_GCM,data:fA6TsvVd0G8Cat9pqRMA644/QFuL6qvjt7mVIl+DS8H/72LcZjrhK0oMLtUFL8N/KElQfAKFi2tkF9000wNhCUHoMnNW/GmebnGd9mlQpIDylGSfGnI2WxEd848R2xH55rKjFQAeE4QVd2XjIyOFsJzRAu6PEotO2Yf/zuo7jdw=,iv:IhyZX0oprBsQCZI6yHfKKkcNlGODLmz8Orl6MqHAYig=,tag:oSNKsJ7yzmeDZs/35jkklA==,type:str] + lastmodified: "2024-12-24T23:19:10Z" + mac: ENC[AES256_GCM,data:56MEPBKQyF4eLm3gr37j1Ka0w+hln+loomiHHbh4BW7d+YWiekpHPGKtz6URpFqS3r1zctPP9Q6hh0mCgdpLWR91u/NTAB6galJt0+Tz6Y4PdbgFUevnWIc3aWl8/HmJXj9RU6vpH7l516sGqPW7x2JnJVenEU6DNFPVArj4tTs=,iv:+K6UaY3WsuAGhejTkEdeQc30klq/Zs0DU5/zAN98CNc=,tag:/NULIaD5pjRRC0BU4vuacA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.2