upgrade cream

flake.lock

@@ -538,15 +538,14 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1680000368,
-        "narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=",
+        "lastModified": 1701728041,
+        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6",
+        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
         "type": "github"
       },
       "original": {
@@ -873,11 +872,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1679793451,
-        "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
+        "lastModified": 1701693815,
+        "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
+        "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573",
         "type": "github"
       },
       "original": {
@@ -1325,21 +1324,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ws-butler": {
       "flake": false,
       "locked": {

flake.nix

@@ -69,6 +69,7 @@
     nixinate.url = "github:matthewcroughan/nixinate";
     stylix = {
       url = "github:danth/stylix?ref=35cab8eb76c1d3672b2b290a64f357847c30d090";
+      #url = "github:danth/stylix";
       #inputs.nixpkgs.follows = "nixpkgs";
       #inputs.home-manager.follows = "home-manager";
     };

nixos/components/gui/style.nix

@@ -29,7 +29,7 @@ with lib;
       };
     };
 
-    fonts.fonts = with pkgs; [
+    fonts.packages = with pkgs; [
 
       corefonts
       hasklig

nixos/components/terminal/zsh.nix

@@ -20,7 +20,7 @@ with lib;
           enable = true;
           config.theme = "gruvbox-light";
         };
-        home.shellAliases.cat = "${pkgs.bat}/bin/bat";
+        home.shellAliases.cat = "${pkgs.bat}/bin/bat --theme='gruvbox-light'";
 
         # a better ls
         # todo what's the new shit?

nixos/machines/cream/configuration.nix

@@ -24,10 +24,6 @@
     ./borg.nix
     ./trilium.nix
 
-    ./test.nix
-
-    #./proxy.nix
-
   ];
 
   components.gui.enable = true;

nixos/machines/cream/packages-development.nix

@@ -30,13 +30,20 @@
       runScript = "datagrip";
     };
 
+    fhsClion = pkgs.buildFHSUserEnv {
+      name = "clion";
+      targetPkgs = pkgs: (with pkgs; [
+        unstable.jetbrains.clion
+      ]);
+      runScript = "clion";
+    };
+
   in
   [
 
     # rust development environment
     gcc
     rustup
-    unstable.jetbrains.clion
 
     awscli2
 
@@ -64,10 +71,17 @@
     fhsPyCharm
     (pkgs.makeDesktopItem {
       name = "pycharm";
-      desktopName = "Python IDE";
+      desktopName = "PyCharm";
       exec = "${fhsPyCharm}/bin/pycharm";
       terminal = false;
     })
+    fhsClion
+    (pkgs.makeDesktopItem {
+      name = "clion";
+      desktopName = "Clion";
+      exec = "${fhsClion}/bin/clion";
+      terminal = false;
+    })
 
     # python
     python3Full

nixos/machines/cream/syncthing.nix

@@ -12,7 +12,7 @@
     #cert = toString config.sops.secrets.syncthing_cert.path;
     #key = toString config.sops.secrets.syncthing_key.path;
     overrideFolders = true;
-    folders = {
+    settings.folders = {
 
       # on encrypted drive
       # ------------------

nixos/machines/cream/test.nix

@@ -1,17 +0,0 @@
-{
-
-
-  virtualisation.oci-containers = {
-    containers.nginx = {
-      image = "nginx";
-    };
-  };
-
-
-  systemd.services.podman-nginx = {
-    unitConfig = {
-      OnFailure = "echo oh noes!";
-      StartLimitBurst = 10;
-    };
-  };
-}

nixos/system/all/syncthing.nix

@@ -4,7 +4,7 @@ with lib; {
   services.syncthing = {
     guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384";
     overrideDevices = lib.mkDefault true;
-    devices =
+    settings.devices =
       let
         device = name: id: {
           "${name}" = {
@@ -42,7 +42,7 @@ with lib; {
         };
       };
 
-    folders = {
+    settings.folders = {
 
       # needs to be on encrypted drives
       # -------------------------------

treefmt.toml

@@ -15,10 +15,10 @@ options = [
 includes = ["*.sh"]
 excludes = ["./scripts/hetzner-dedicated-wipe-and-install-nixos.sh"]
 
-[formatter.shellcheck]
-command = "shellcheck"
-includes = ["*.sh"]
-excludes = ["./scripts/hetzner-dedicated-wipe-and-install-nixos.sh"]
+#[formatter.shellcheck]
+#command = "shellcheck"
+#includes = ["*.sh"]
+#excludes = ["./scripts/hetzner-dedicated-wipe-and-install-nixos.sh"]
 
 [formatter.python]
 command = "black"