updated flake

flake.lock

@@ -47,11 +47,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1702058649,
+        "lastModified": 1702999846,
-        "narHash": "sha256-qn9Une0ynLVE8Y2XkMD7mDzwsbSuxnkQg1rt9jPGPZE=",
+        "narHash": "sha256-5/sHtALCy1HymaJgdcmXM4/qpY3SBqlXvfOlB7DCocY=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "510928618dfcddcd6d3086b278332fa93ee32998",
+        "rev": "63218a512687cf6cfdbd11f088d0a2cb7d4dfcb8",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701728041,
+        "lastModified": 1702937117,
-        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
+        "narHash": "sha256-4GjkL2D01bDg00UZN/SeGrnBZrDVOFeZTbQx6U702Vc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
+        "rev": "e8aaced73ebaf6bfa8e3c6ab0a19cb184bc4d798",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1701656485,
+        "lastModified": 1702453208,
-        "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
+        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
         "owner": "NixOs",
         "repo": "nixos-hardware",
-        "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
+        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701718080,
+        "lastModified": 1702830618,
-        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
+        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
+        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1702079139,
+        "lastModified": 1702997397,
-        "narHash": "sha256-P60Q83fiXY4x+pq0mbNAdT5AdiJEpeFLaUZK+hArYVg=",
+        "narHash": "sha256-th/EqbtB6jDFhe12kTsssDzF9Ev0p9Yq/oaiWXS3H9w=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "eeb0b84c55657be1575872467aa5a40835af2dcd",
+        "rev": "a04eea76ecdc42258fc3ed8391ba838145d0b96a",
         "type": "github"
       },
       "original": {

hosts/JWST/configuration.nix

@@ -43,6 +43,10 @@
 
   networking.hostName = "JWST";
   networking.networkmanager.enable = true;
+  networking.resolvconf.extraConfig = ''
+    name_servers="1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001"
+    name_server_blacklist="129.21.3.17 129.21.4.18 2620:8d:8000:0:aba:ca:daba:ec"
+  '';
 
   # Sound
   sound.enable = true;
@@ -59,7 +63,11 @@
   services.blueman.enable = true;
   services.printing.enable = true;
   services.geoclue2.enable = true;
+  services.mullvad-vpn.enable = true;
+  services.mullvad-vpn.enableExcludeWrapper = false;
+  services.fwupd.enable = true;
   security.rtkit.enable = true;
+  services.resolved.enable = true;
 
   services.udev.extraRules = ''
     # 0d28:0204 DAPLink
@@ -96,6 +104,7 @@
       "nvidia-x11"
       "nvidia-settings"
       "discord"
+      "spotify"
     ];
 
   programs.nix-index.enable = true;
@@ -105,6 +114,7 @@
 
   environment = {
     systemPackages = with pkgs; [
+      screen
       vim
       exfat
       encfs

users/tacocat/helix/default.nix

@@ -17,7 +17,6 @@
       nil
       nodePackages.bash-language-server
       shellcheck
-      java-language-server
       texlab
       tectonic
       lua-language-server

users/tacocat/home.nix

@@ -14,6 +14,9 @@
     ];
     packages = with pkgs; [
       mpv
+      rtorrent
+      wireguard-tools
+      spotify
       nextcloud-client
       xournalpp
       cardinal
@@ -30,7 +33,6 @@
       fzf
       zathura
       pyocd
-      screen
       wineWowPackages.stable
       comic-mono
       maple-mono
@@ -41,7 +43,6 @@
       (nerdfonts.override {fonts = ["FiraCode"];})
       gnupg
       pandoc
-      jdk20
       maven
       pdftk
       git

users/tacocat/programs/firefox.nix

@@ -74,7 +74,7 @@
         };
         search = {
           force = true;
-          default = "Celtic Lite";
+          default = "Catgirl";
           engines = {
             "Nix Packages" = {
               urls = [
@@ -113,6 +113,20 @@
               ];
               definedAliases = ["@cl"];
             };
+            "Catgirl" = {
+              urls = [
+                {
+                  template = "https://sx.catgirl.cloud/search";
+                  params = [
+                    {
+                      name = "q";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+              definedAliases = ["@cg"];
+            };
             "Google".metaData.hidden = true;
             "Amazon.com".metaData.hidden = true;
             "Bing".metaData.hidden = true;
@@ -127,7 +141,7 @@
 
               --arrowpanel-background: ${theme.base00} !important;
               --arrowpanel-border-color: ${theme.base02} !important;
-              --autocomplete-popup-highlight-color: ${theme.base01} !important;
+              --autocomplete-popup-highlight-color: ${theme.base02} !important;
               --autocomplete-popup-highlight-background: ${theme.base06} !important;
               --toolbarbutton-active-background: ${theme.base06} !important;
               --lwt-toolbarbutton-icon-fill-attention: var(--button-primary-bgcolor, ${theme.base06}) !important;
@@ -144,41 +158,22 @@
           #navigator-toolbox,
           #sidebar-box {
               background-color: ${theme.base02} !important;
-              -moz-appearance: none !important;
-              background-image: none !important;
-              border: none !important;
           }
           .tab-background[selected="true"] {
               background-color: ${theme.base00} !important;
-              -moz-appearance: none !important;
-              background-image: none !important;
-              border: none !important;
           }
           .tab-background {
               background-color: ${theme.base02} !important;
-              border-radius: 0px !important;
-              margin-block: 0px !important;
-              min-height: 0px !important;
           }
           .tabbrowser-tab:hover .tab-background {
               background-color: ${theme.base09} !important;
           }
-          .tabbrowser-tab[fadein] {
-              max-width: 100vw !important;
-          }
           #urlbar {
               background-color: #11171D !important;
               border-radius: 10px !important;
           }
           #nav-bar {
               background-color: ${theme.base02} !important;
-              -moz-appearance: none !important;
-              background-image: none !important;
-              border: none !important;
-              transition: margin 0.5s !important;
-          }
-          #TabsToolbar {
-              z-index: 1000 !important;
           }
           #firefox-view-button {
             visibility: collapse;
@@ -186,12 +181,6 @@
           #alltabs-button {
             visibility: collapse;
           }
-          hbox.titlebar-spacer:nth-child(3) {
-            visibility: collapse;
-          }
-          hbox.titlebar-buttonbox-container:nth-child(5) {
-            visibility: collapse;
-          }
           #mainPopupSet menupopup,
           menupopup:not(.in-menulist) > menuitem,
           menupopup:not(.in-menulist) > menu {
@@ -199,69 +188,8 @@
               border-radius: 0px !important;
               padding: 0px 0px 0px 0px  !important;
           }
-          .tabbrowser-tab {
-            height: 25px !important;
-            z-index: 1000 !important;
-            padding: none !important;
-            padding-inline: 0px !important;
-          }
           /*
-          #navigator-toolbox:not(:focus-within):not(:hover) #nav-bar {
-            margin-top: -40px !important;
-          }
           */
-          .tab-line {
-            display: none !important;
-          }
-          .tab-icon-image:not([pinned]){
-            display: none !important;
-          }
-          #tab-content {
-            vertical-align: middle !important;
-          }
-          .tab-text,
-          .tab-label {
-            -moz-box-flex: 1 !important;
-            text-align: center !important;
-          }
-          .tab-secondary-label {
-            display:none !important;
-          }
-          .tab-label {
-            padding-top: 5px !important;
-            overflow: hidden !important;
-          }
-          .tabbrowser-tab .tab-label-container {
-            margin-inline-end: 7px !important;
-          }
-          .tab-label-container {
-            -moz-box-pack: center !important;
-            -moz-box-orient: horizontal !important;
-            display: grid !important;
-            justify-content: safe center !important;
-          }
-          #tabbrowser-tabs {
-            -moz-box-flex: 1 !important;
-            text-align: center !important;
-            border-inline-start: 0px !important;
-            padding-inline-start: 0px !important;
-            margin-inline-start: 0px !important;
-          }
-          #tabs-newtab-button{
-            display: none !important;
-          }
-          .tabbrowser-tab::before,
-          .tabbrowser-tab::after{
-            display: none !important;
-          }
-          .tab-close-button {
-            display: none !important;
-            border-radius: 10px !important;
-          }
-          #identity-box,
-          #tracking-protection-icon-container {
-            display: none !important;
-          }
           #back-button>.toolbarbutton-icon {
             transform: scale(.85, .85) !important;
             animation: none !important;
@@ -279,7 +207,6 @@
           #whats-new-menu-button,
           #pocket-button,
           #save-to-pocket-button
-          #pageActionSeparator,
           #reader-mode-button {
               display: none !important;
           }
@@ -289,9 +216,6 @@
           #save-to-pocket-button {
               visibility: hidden !important;
           }
-          #PanelUI-button {
-              border-image-slice: 0 !important;
-          }
           #urlbar-input {
               background-color: ${theme.base00} !important;
               padding-left: 5px !important;
@@ -309,13 +233,6 @@
               background-color: ${theme.base06} !important;
               color: ${theme.base00} !important;
           }
-          .urlbarView-body-inner {
-              border-top: none !important;
-          }
-          #nav-bar {
-              border-bottom: 0px !important;
-              box-shadow: none !important;
-          }
           #urlbar ::-moz-selection,
           .searchbar-textbox ::-moz-selection {
               background-color: ${theme.base01} !important;
@@ -345,21 +262,10 @@
               padding-inline: var(--urlbarView-item-inline-padding) 18px;
               opacity: 0.6;
           }
-          :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
+          #tabbrowser-tabs {
-          :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
+          border-inline-start: none !important;
-            toolbarbutton:not(#firefox-view-button),
-            toolbarpaletteitem:not(#wrapper-firefox-view-button)
-          ) + #tabbrowser-tabs {
-            border-inline-start: 0px !important;
-            padding-inline-start: 0px !important;
-            margin-inline-start: 0px !important;
           }
-          .tab-icon-stack {
+
-            display: none;
-          }
-          .tab-label {
-            white-space: nowrap;
-            line-height: 2 !important;  /* override 'normal' in case of fallback math fonts with huge metrics */
           }
         '';
         userContent = ''
@@ -427,9 +333,4 @@
     };
   };
 
-  # home.file."theme" = {
-  #   source = "${inputs.firefox-rose}/dist";
-  #   target = ".mozilla/firefox/aria/chrome";
-  #   recursive = true;
-  # };
 }