update params based on recent docker changes

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

.vscode/settings.json

@@ -165,7 +165,6 @@
     "optimumwifi",
     "optoutstudies",
     "overscroll",
-    "overseerr",
     "oxalica",
     "pavucontrol",
     "pbmode",

flake.lock

@@ -73,6 +73,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1722925878,
+        "narHash": "sha256-/wuVEbsqQnaNAYKqe/7CXm8cQXMAfsQYg9Mtkm2Aetg=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "aefb786b6a2924f684ba9ecd8fcad4628b214ffe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "firefox-addons": {
       "inputs": {
         "flake-utils": [
@@ -229,6 +250,56 @@
         "type": "github"
       }
     },
+    "libgit2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1715853528,
+        "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
+        "owner": "libgit2",
+        "repo": "libgit2",
+        "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
+        "type": "github"
+      },
+      "original": {
+        "owner": "libgit2",
+        "ref": "v1.8.1",
+        "repo": "libgit2",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "git-hooks-nix": [
+          "pre-commit-hooks"
+        ],
+        "libgit2": "libgit2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-23-11": "nixpkgs-23-11",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1722501671,
+        "narHash": "sha256-3yFEvUDPB7GlCMI9I5VV+HXMVOT38h3lnw01nIXU2F4=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "0a167ffd1f57864ce042d83f9d1f17ef5126c442",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "latest-release",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -384,6 +455,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-23-11": {
+      "locked": {
+        "lastModified": 1717159533,
+        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1722555339,
@@ -396,6 +483,22 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
       }
     },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1722869614,
@@ -499,12 +602,14 @@
       "inputs": {
         "arch_mirror": "arch_mirror",
         "attic": "attic",
+        "fenix": "fenix",
         "firefox-addons": "firefox-addons",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
         "hyprland-contrib": "hyprland-contrib",
+        "nix": "nix",
         "nix-index-database": "nix-index-database",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
@@ -519,6 +624,23 @@
         "wired-notify": "wired-notify"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722868550,
+        "narHash": "sha256-Z708uZsfcP6IprVtw1AwjN0zjUX5+6lbneYiin58umc=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "4a99d795d06970accb46bd594f473999818b2fa8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [

flake.nix

@@ -44,6 +44,11 @@
       };
     };
 
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs = {
@@ -67,11 +72,20 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nix = {
+      url = "github:NixOS/nix/latest-release";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+        flake-parts.follows = "flake-parts";
+        git-hooks-nix.follows = "pre-commit-hooks";
+      };
+    };
+
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";

modules/yubikey.nix

@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.rad-dev.yubikey;
-in
-{
-  options = {
-    services.rad-dev.yubikey = {
-      enable = lib.mkEnableOption "enable yubikey defaults";
-      enable-desktop-app = lib.mkEnableOption "installs desktop application";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    # enable the smart card daemon for certain yubikey operations
-    services.pcscd.enable = true;
-
-    environment.systemPackages = lib.optionals cfg.enable-desktop-app [ pkgs.yubioath-flutter ];
-  };
-}

statix.toml

@@ -1,4 +1,4 @@
 disabled = ["empty_pattern"]
-nix_version = '2.23'
+nix_version = '2.4'
 ignore = ['.direnv']
 

systems/artemision/configuration.nix

@@ -84,10 +84,6 @@
       };
       #systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd.
     };
-    rad-dev.yubikey = {
-      enable = true;
-      enable-desktop-app = true;
-    };
   };
 
   users.users.alice.extraGroups = [ "calibre-web" ];

systems/artemision/programs.nix

@@ -12,7 +12,7 @@
     calibre
     # calibre dedrm?
     candy-icons
-    nemo-with-extensions
+    cinnamon.nemo-with-extensions
     croc
     deadnix
     direnv
@@ -93,6 +93,7 @@
     wget
     wl-clipboard
     xboxdrv
+    yubioath-flutter
     zoom-us
     zoxide
     zoom

systems/jeeves/docker/internal.nix

@@ -112,23 +112,6 @@ in
       ];
       autoStart = true;
     };
-    overseerr = {
-      image = "ghcr.io/linuxserver/overseerr";
-      environment = {
-        PUID = "600";
-        PGID = "100";
-        TZ = "America/New_York";
-      };
-      volumes = [ "${vars.media_docker_configs}/overseerr:/config" ];
-      # TODO: remove ports later since this is going through web
-      ports = [ "5055:5055" ];
-      dependsOn = [
-        "radarr"
-        "sonarr"
-      ];
-      extraOptions = [ "--network=web" ];
-      autoStart = true;
-    };
     whisper = {
       image = "ghcr.io/linuxserver/faster-whisper:latest";
       ports = [ "10300:10300" ];

systems/jeeves/docker/web.nix

@@ -52,6 +52,23 @@ in
       extraOptions = [ "--network=web" ];
       autoStart = true;
     };
+    overseerr = {
+      image = "lscr.io/linuxserver/overseerr";
+      environment = {
+        PUID = "600";
+        PGID = "100";
+        TZ = "America/New_York";
+      };
+      volumes = [ "${vars.media_docker_configs}/overseerr:/config" ];
+      # TODO: remove ports later since this is going through web
+      ports = [ "5055:5055" ]; # Web UI port
+      dependsOn = [
+        "radarr"
+        "sonarr"
+      ];
+      extraOptions = [ "--network=web" ];
+      autoStart = true;
+    };
   };
 
   sops = {

users/richie/home/gui/default.nix

@@ -8,8 +8,8 @@
   home.packages = with pkgs; [
     beeper
     candy-icons
-    nemo
-    nemo-fileroller
+    cinnamon.nemo
+    cinnamon.nemo-fileroller
     discord-canary
     gimp
     gparted