fixes

Author: vic

Diff for: devshells/nixos.toml

@@ -32,7 +32,7 @@ journalctl -u home-manager-vic.service "${@}"
 name = "os-rebuild"
 help = "OS rebuild"
 command = """
-sudo nix --extra-experimental-features "flakes nix-command" run .#os-rebuild --repair -- "${@}"
+sudo nix --extra-experimental-features "flakes nix-command" run .#os-rebuild -- "${@}"
 """
 
 [[commands]]

Diff for: hosts/bombadil/configuration.nix

@@ -1,7 +1,6 @@
 #  nix build .#.nixosConfigurations.bombadil.config.system.build.isoImage
 {
   modulesPath,
-  pkgs,
   config,
   lib,
   inputs,
@@ -25,6 +24,8 @@
     fsType = "ext4";
   };
 
+  users.users.vic.uid = 1000;
+  users.users.nixos.uid = 1001;
 
   vix.features.macos-keys.enable = true;
 

Diff for: hosts/smaug/filesystems.nix

@@ -19,10 +19,10 @@
     ];
   };
 
-  # fileSystems."/home" = {
-  #   device = "/dev/disk/by-uuid/fc6e67f6-3b0f-4a6b-b7ee-6977b5fc98d6";
-  #   fsType = "ext4";
-  # };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-label/home";
+    fsType = "ext4";
+  };
 
   # swapDevices = [
   #   { device = "/dev/disk/by-uuid/6f9b9136-d3aa-4c2d-9e7e-b5aea574bca0"; }

Diff for: modules/home/vic-desktop.nix

@@ -1,14 +1,21 @@
-{ pkgs, osConfig, lib, ... }:
+{
+  pkgs,
+  osConfig,
+  lib,
+  ...
+}:
 {
 
-  home.packages = ([
-    pkgs.librewolf
-    pkgs.vscode
-    pkgs.wezterm
-    pkgs.ghostty
-  ]) ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
-    pkgs.code-cursor
-    pkgs.zed-editor
-  ]);
+  home.packages =
+    ([
+      pkgs.librewolf
+      pkgs.vscode
+      pkgs.wezterm
+      pkgs.ghostty
+    ])
+    ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
+      pkgs.code-cursor
+      pkgs.zed-editor
+    ]);
 
 }

Diff for: modules/home/vic.nix

@@ -7,20 +7,22 @@
 }:
 {
 
-  imports = [
-    ./nix-registry.nix
-    ./vic/secrets.nix
-    ./vic/ssh.nix
-    ./vic/fish.nix
-    ./vic/git.nix
-    ./vic/jujutsu.nix
-    ./vic/doom.nix
-    ./vic/nvim.nix
-    ./vic/dots.nix
-  ] ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
-    ./devshells.nix
-    ./nix-index.nix
-  ]);
+  imports =
+    [
+      ./vic/secrets.nix
+      ./vic/ssh.nix
+      ./vic/fish.nix
+      ./vic/git.nix
+      ./vic/jujutsu.nix
+      ./vic/doom.nix
+      ./vic/nvim.nix
+      ./vic/dots.nix
+    ]
+    ++ (lib.optionals (osConfig.networking.hostName != "bombadil") [
+      ./nix-registry.nix
+      ./devshells.nix
+      ./nix-index.nix
+    ]);
 
   home.packages =
     let
@@ -34,6 +36,7 @@
         pkgs.nixd # lsp
         pkgs.nixfmt-rfc-style
         pkgs.ispell
+        pkgs.gh
       ];
 
       anywhere = nonBombadil ++ [
@@ -50,8 +53,8 @@
         pkgs.lazygit # no magit
         pkgs.tig # alucard
         pkgs.cachix
-        pkgs.gh
         pkgs.jq
+        pkgs.gparted
       ];
 
       perHost = {
@@ -60,6 +63,9 @@
           perSystem.radicle.radicle-full
           perSystem.nix-inspect.default # TODO: enabling it causes GH-action to fail
         ];
+        bombadil = [
+          pkgs.home-manager
+        ];
       };
 
       perPlatform = {

Diff for: modules/home/vic/ssh.nix

@@ -51,7 +51,7 @@
 
   services.ssh-agent.enable = pkgs.stdenv.isLinux;
 
-  home.activation.link-ssh-id = lib.hm.dag.entryAfter [ "link-flake" "sops-nix" ] ''
+  home.activation.link-ssh-id = lib.hm.dag.entryAfter [ "link-flake" "sops-nix" "reloadSystemd" ] ''
     run ln -sf "${config.sops.secrets."ssh/id_ed25519".path}" $HOME/.ssh/id_ed25519
   '';
 }

Diff for: packages/os-rebuild.nix

@@ -16,7 +16,7 @@ let
       platform = os.config.nixpkgs.hostPlatform;
       darwin-rebuild = lib.getExe inputs.nix-darwin.packages.${platform.system}.darwin-rebuild;
       nixos-rebuild = lib.getExe pkgs.nixos-rebuild;
-      flake-param = ''--flake "path:${inputs.self}#${name}" --repair'';
+      flake-param = ''--flake "path:${inputs.self}#${name}" '';
     in
     pkgs.writeShellApplication {
       name = "${name}-os-rebuild";