Merge pull request #8 from cnsta/firefox

changes to firefox and some other things

flake.lock

@@ -81,12 +81,12 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1723207651,
+        "lastModified": 1723215873,
-        "narHash": "sha256-aE6vRFo4GQubaPwLEPXtyYKACfxY+JEykbKZXna7dek=",
+        "narHash": "sha256-LuSdVL3GztsIERwdJdr4EeBP9Ris8jbdyL+AlIn8G48=",
-        "rev": "7483b4d9ade629d2f6b4f9d6ff87a9a1cbcabd26",
+        "rev": "d756ef86407a02a6749cf4231acbc4cbf7448c61",
-        "revCount": 1330,
+        "revCount": 1331,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1330%2Brev-7483b4d9ade629d2f6b4f9d6ff87a9a1cbcabd26/01913730-d874-73b1-bb36-4ad0d19fd365/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1331%2Brev-d756ef86407a02a6749cf4231acbc4cbf7448c61/019137ae-e116-7d93-871f-03a1793a36a4/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -158,11 +158,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1723098624,
+        "lastModified": 1723185066,
-        "narHash": "sha256-TFg+lq7pHgCnsB4nRmMeTxSnZXHvzYJ2IHyEiw8zEF8=",
+        "narHash": "sha256-u7guFfIrfspwUp6/SEWCDhs2tVoE1fcgft0Fw7LdNEU=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "d6022ac563f2f48d8eeff89ca3589c8adc5235f6",
+        "rev": "d5f1b280af93acddbcce948d946bb5db2f8035fe",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1723176196,
+        "lastModified": 1723262595,
-        "narHash": "sha256-8FWJ0kJN6yin5Z9BhtPlVaRzj9ljuUdaBT2i/bquJO4=",
+        "narHash": "sha256-IPMyBC2oLn4ZnpKpfm4QAZhUM1/84CU4ukWNNKFP1is=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "ce877fc7a74fb1abfedcdb4f78e67d930a0841c8",
+        "rev": "e281296c5bb98af6c67bfdc873acfd5bd4a5a07d",
         "type": "gitlab"
       },
       "original": {
@@ -205,11 +205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723206565,
+        "lastModified": 1723292846,
-        "narHash": "sha256-6sfwL4sQ8JJpqpiZ1srM6xy3CDlgACzRo2ljhU5jhPI=",
+        "narHash": "sha256-jKATsR783ufImd6pJolhGSa+F6vNMN+bx5VMneMsbeM=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "c39603b3a7af339b9abd2a9f3458f95a1380ca5b",
+        "rev": "6fc55de16cdbe194dd95cdf10c7727e813e265ff",
         "type": "github"
       },
       "original": {
@@ -522,11 +522,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1723149858,
+        "lastModified": 1723310128,
-        "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
+        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
+        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
         "type": "github"
       },
       "original": {
@@ -663,11 +663,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1723215081,
+        "lastModified": 1723241066,
-        "narHash": "sha256-HVaAneYjMwsXXpbxDVmk+G2h1uQvAhog3QxZGuVDbX8=",
+        "narHash": "sha256-et+BwLETF5e/9jBHK2GnVh6WGjRztRBThtllMezCvcM=",
         "ref": "refs/heads/main",
-        "rev": "fd1d4e288edd586a3d5273cda053a51f5b14cad7",
+        "rev": "4fdc0d55e4b44bb5300679025d2378fb6de0cae4",
-        "revCount": 5072,
+        "revCount": 5074,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -1061,11 +1061,11 @@
     },
     "nixpkgs-small": {
       "locked": {
-        "lastModified": 1723197662,
+        "lastModified": 1723274555,
-        "narHash": "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg=",
+        "narHash": "sha256-gDCMNBju0BwYHUPp6RVVnqE0VnbXl53VMk21OT9fkFw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0048951e7a3eba3dce8bf6ba893390d29375c5d0",
+        "rev": "33c40979a7ccf487d6c0e1a420ecf8e4ac2b676e",
         "type": "github"
       },
       "original": {
@@ -1171,16 +1171,32 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1722813957,
         "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -1194,18 +1210,16 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_7",
-          "nixpkgs"
-        ],
         "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723192118,
+        "lastModified": 1723230145,
-        "narHash": "sha256-juQM/w6GY8aHQCBazvyMEPlfnt4pB+ja7WDQOQQYyEY=",
+        "narHash": "sha256-FyjcuYZMqXdiKOXkHaIC2ubag+TPV9Z12urC/sdVI6A=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c46bd820adabaf23acbccbbd226b1941566acb51",
+        "rev": "4852f94f8ccae551514df0092a077014bafb95ca",
         "type": "github"
       },
       "original": {
@@ -1291,11 +1305,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1723042912,
+        "lastModified": 1723124382,
-        "narHash": "sha256-Ff4nCgmlSWVOMvRVVf6gTYgmZjGw9EjIFHG0aUFg+D8=",
+        "narHash": "sha256-WdJYEBlc8qsif+y4qnkjaeEpDmOZhz8qA6i/2n1q2kw=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "935883fd826c46e7e7e6de19cf24377c21f1b2ba",
+        "rev": "dab022fb3127466e47e29e40769b11174b3e0ac3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -46,7 +46,7 @@
     };
     nixvim = {
       url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-parts = {
       url = "github:hercules-ci/flake-parts";

home/bin/neovim/plugins/lsp.nix

@@ -28,7 +28,7 @@
           cssls.enable = true; # CSS
           tailwindcss.enable = true; # TailwindCSS
           html.enable = true; # HTML
-          astro.enable = true; # AstroJS
+          astro.enable = false; # AstroJS
           phpactor.enable = true; # PHP
           svelte.enable = false; # Svelte
           vuels.enable = false; # Vue

home/default.nix

@@ -23,6 +23,8 @@
       ./usr/share/git/cnst
       ./usr/share/shell/adam
       ./etc/hyprland/cnst
+      ./opt/browsers/firefox
+      ./opt/sops
       ./etc
       ./bin
       ./opt
@@ -33,6 +35,8 @@
       ./usr/share/git/toothpick
       ./usr/share/shell/toothpick
       ./bin/hyprland/toothpick
+      ./opt/browsers/firefox
+      ./opt/sops
       ./etc
       ./bin
       ./opt

home/opt/browsers/firefox/default.nix

@@ -6,7 +6,8 @@
   programs.firefox = {
     enable = true;
     package = inputs.firefox-nightly.packages.${pkgs.system}.firefox-nightly-bin;
-    profiles.cnst = {
+    profiles = {
+      default = {
         search = {
           force = true;
           default = "DuckDuckGo";
@@ -29,4 +30,5 @@
         };
       };
     };
+  };
 }

home/usr/share/shell/adam/default.nix

@@ -12,8 +12,8 @@
       ll = "ls -l";
       nixupdate = "nh os switch -v -H adampad";
       nixup = "nh os switch -H adampad";
-      flakeupdate = "nh os switch -u -v -H adampad";
+      flakeupdate = "nh os switch -u -v -H adampad && sudo nix run .#cleanup-boot";
-      flakeup = "nh os switch -u -H adampad";
+      flakeup = "nh os switch -u -H adampad && sudo nix run .#cleanup-boot";
     };
     history = {
       size = 1000;

home/usr/share/shell/toothpick/default.nix

@@ -12,8 +12,8 @@
       ll = "ls -l";
       nixupdate = "nh os switch -v -H toothpc";
       nixup = "nh os switch -H toothpc";
-      flakeupdate = "nh os switch -u -v -H toothpc";
+      flakeupdate = "nh os switch -u -v -H toothpc && sudo nix run .#cleanup-boot";
-      flakeup = "nh os switch -u -H toothpc";
+      flakeup = "nh os switch -u -H toothpc && sudo nix run .#cleanup-boot";
     };
     history = {
       size = 1000;