chore: update to nixos 23.11

configuration.nix

@@ -54,7 +54,7 @@
     keyMap = "de-latin1-nodeadkeys";
   };
 
-  fonts.packages = with pkgs; [
+  fonts.fonts = with pkgs; [
     (nerdfonts.override { fonts = [ "DejaVuSansMono" "NerdFontsSymbolsOnly" ]; })
     dejavu_fonts
     fira-code
@@ -92,15 +92,6 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-wlr
-      pkgs.xdg-desktop-portal-gtk
-    ];
-    config = {
-      common = {
-        default = [ "wlr" "gtk" ];
-      };
-    };
   };
 
   services.udev.packages = [ pkgs.yubikey-personalization ];

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702195709,
+        "lastModified": 1700814205,
-        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701952659,
+        "lastModified": 1701263465,
-        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1702151865,
+        "lastModified": 1701068326,
-        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
         "type": "github"
       },
       "original": {

home-manager/carapace.nix

@@ -1,9 +0,0 @@
-{ config, lib, pkgs, user, theme, ... }:
-{
-  programs.carapace = {
-    enable = true;
-    enableZshIntegration = true;
-    enableNushellIntegration = true;
-  };
-}
-

home-manager/direnv.nix

@@ -5,7 +5,6 @@
     direnv = {
       enable = true;
       enableZshIntegration = true;
-      enableNushellIntegration = true;
       nix-direnv.enable = true;
     };
   };

home-manager/neovim/lspconfig.lua

@@ -86,7 +86,6 @@ local servers = {
         },
     },
     ["marksman"] = {},
-    ["nushell"] = {},
     ["pylsp"] = {
         pylsp = {
             plugins = {

home-manager/nushell.nix

@@ -1,38 +0,0 @@
-{ config, lib, pkgs, user, theme, ... }:
-{
-  programs.nushell = {
-    enable = true;
-    extraConfig = ''
-      let carapace_completer = {|spans|
-      carapace $spans.0 nushell $spans | from json
-      }
-      $env.config = {
-       show_banner: false,
-       completions: {
-       case_sensitive: false # case-sensitive completions
-       quick: true    # set to false to prevent auto-selecting completions
-       partial: true    # set to false to prevent partial filling of the prompt
-       algorithm: "fuzzy"    # prefix or fuzzy
-       external: {
-       # set to false to prevent nushell looking into $env.PATH to find more suggestions
-           enable: true 
-       # set to lower can improve completion performance at the cost of omitting some options
-           max_results: 100 
-           completer: $carapace_completer # check 'carapace_completer' 
-         }
-       }
-      } 
-      $env.PATH = ($env.PATH | 
-      split row (char esep) |
-      prepend /home/myuser/.apps |
-      append /usr/bin/env
-      )
-    '';
-    shellAliases = {
-      vi = "hx";
-      vim = "hx";
-      nano = "hx";
-    };
-  };
-}
-

home-manager/sway/default.nix

@@ -13,6 +13,7 @@ in
 
   home.packages = with pkgs; [
     xdg-utils
+    swaylock-fancy
     shotman
     wl-clipboard
   ];
@@ -32,11 +33,6 @@ in
     };
   };
 
-  programs.swaylock = {
-    enable = true;
-    package = pkgs.swaylock-fancy;
-  };
-
   home.pointerCursor = {
     name = "Adwaita";
     package = pkgs.gnome.adwaita-icon-theme;
@@ -82,15 +78,12 @@ in
         "*" = {
           hide_cursor = "5000";
         };
-
       };
 
       defaultWorkspace = "1";
 
       focus.newWindow = "urgent";
 
-      floating.criteria = [{ app_id = "zoom"; floating = true; }];
-
       fonts = {
         names = [ font.name ];
         size = font.size;

home-manager/zoxide.nix

@@ -1,10 +0,0 @@
-{ config, lib, pkgs, user, theme, ... }:
-
-{
-  programs.zoxide = {
-    enable = true;
-    enableNushellIntegration = true;
-    enableZshIntegration = true;
-  };
-}
-

home-manager/zsh.nix

@@ -5,8 +5,8 @@ in
 {
   programs.zsh = {
     enable = true;
-    # enableAutosuggestions = true;
+    enableAutosuggestions = true;
-    # enableCompletion = true;
+    enableCompletion = true;
     history.size = 10000;
 
     initExtra = ''

home-mandlm.nix

@@ -4,9 +4,6 @@
   home = {
     username = "${user}";
     homeDirectory = "/home/${user}";
-    sessionPath = [
-      "$HOME/.cargo/bin/"
-    ];
 
     packages = with pkgs; [
       unstable.eza
@@ -33,7 +30,6 @@
       gnome.simple-scan
       calibre
       libreoffice
-      gthumb
     ];
 
     stateVersion = "22.05";
@@ -47,13 +43,10 @@
     ./home-manager/kitty.nix
     ./home-manager/neovim
     ./home-manager/gpg
-    ./home-manager/carapace.nix
     ./home-manager/zsh.nix
-    ./home-manager/nushell.nix
     ./home-manager/starship.nix
     ./home-manager/sway
     ./home-manager/direnv.nix
     ./home-manager/bat.nix
-    ./home-manager/zoxide.nix
   ];
 }

users.nix

@@ -8,7 +8,7 @@
       isNormalUser = true;
       uid = 1000;
       home = "/home/mandlm";
-      shell = pkgs.nushell;
+      shell = pkgs.zsh;
       extraGroups = [ "wheel" "networkmanager" "audio" "video" "input" "docker" "scanner" "lp" ];
       hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
       openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];