update ultrastable, misc gnome stuff

modules/desktop/gnome.nix

@@ -25,7 +25,7 @@ in {
         tracker-miners.enable = false;
         tracker.enable = false;
         sushi.enable = true;
-        #gnome-remote-desktop.enable = true;
+        gnome-remote-desktop.enable = true;
       };
     };
 
@@ -41,12 +41,11 @@ in {
       epiphany # web browser
       evince # document viewer
       geary # email client
-      seahorse # password manager
+      #seahorse # password manager
       gnome-clocks
       gnome-maps
       gnome-weather
       gnome-music
-      pkgs.gnome-connections
     ];
   };
 }

modules/nixpkgs.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   unstable-commit-sha = "fa804edfb7869c9fb230e174182a8a1a7e512c40";
-  ultrastable-commit-sha = "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857";
+  ultrastable-commit-sha = "8f1180704ac35baded1a74164365ac7cdfba6f38";
 in {
   options.my.allowUnfreePackages = lib.mkOption {
     type = lib.types.listOf lib.types.str;

modules/users/vinzenz-home.nix

@@ -1,193 +1,205 @@
 {
   config,
+  osConfig,
   pkgs,
+  lib,
   ...
-}: {
+}: let
-  home.packages = with pkgs; [
+  isGnomeEnabled = osConfig.my.desktop.enableGnome;
-    keepassxc
+in
-    unstable.insync
+  lib.mkMerge [
-    telegram-desktop
+    {
-    simple-scan
+      home.packages = with pkgs; [
-    wireguard-tools
+        keepassxc
-    element-desktop
+        unstable.insync
-    etcher
+        telegram-desktop
-    iotop
+        simple-scan
-    lsof
+        wireguard-tools
-    wirelesstools
+        element-desktop
-    thefuck
+        etcher
-    dotnet-sdk_7
+        iotop
-    ultrastable.jetbrains.rider
+        lsof
-    alejandra
+        wirelesstools
-    arduino
+        thefuck
-    uucp
+        dotnet-sdk_7
-    screen
+        ultrastable.jetbrains.rider
-    ultrastable.jetbrains.pycharm-professional
+        alejandra
-    kdiff3
+        arduino
-    docker
+        uucp
-    youtube-music
+        screen
+        ultrastable.jetbrains.pycharm-professional
+        kdiff3
+        docker
+        youtube-music
 
-    cargo
+        cargo
-    rustc
+        rustc
-    gcc
+        gcc
-    rustfmt
+        rustfmt
-    clippy
+        clippy
-    cargo-generate
+        cargo-generate
-  ];
+      ];
 
-  programs = {
+      programs = {
-    home-manager.enable = true;
+        home-manager.enable = true;
 
-    fzf.enable = true;
+        fzf.enable = true;
-    mangohud.enable = true;
+        mangohud.enable = true;
 
-    zsh = {
+        zsh = {
-      initExtra = ''
+          initExtra = ''
-        eval "$(direnv hook zsh)";
+            eval "$(direnv hook zsh)";
-        eval $(thefuck --alias);
+            eval $(thefuck --alias);
-      '';
+          '';
 
-      shellAliases = {
+          shellAliases = {
-        my-apply = "sudo nixos-rebuild boot";
+            my-apply = "sudo nixos-rebuild boot";
-        my-switch = "sudo nixos-rebuild switch";
+            my-switch = "sudo nixos-rebuild switch";
-        my-update = "sudo nixos-rebuild boot --upgrade";
+            my-update = "sudo nixos-rebuild boot --upgrade";
-        my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
+            my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
-        my-fmt = "alejandra .";
+            my-fmt = "alejandra .";
-        my-test = "sudo nixos-rebuild test";
+            my-test = "sudo nixos-rebuild test";
-        my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
+            my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
-        my-ip4 = "ip addr show | grep 192";
+            my-ip4 = "ip addr show | grep 192";
+          };
+
+          history = {
+            size = 10000;
+            path = "${config.xdg.dataHome}/zsh/history";
+            expireDuplicatesFirst = true;
+          };
+
+          oh-my-zsh = {
+            enable = true;
+            theme = "agnoster";
+            plugins = ["git" "sudo" "docker" "systemadmin" "thefuck"];
+          };
+        };
+
+        git = {
+          enable = true;
+          userName = "Vinzenz Schroeter";
+          userEmail = "vinzenz.f.s@gmail.com";
+
+          aliases = {
+            prettylog = "log --pretty=oneline --graph";
+            spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
+          };
+
+          extraConfig = {
+            pull.ff = "only";
+            merge.tool = "kdiff3";
+            push.autoSetupRemote = "true";
+          };
+        };
+
+        vscode = {
+          enable = true;
+          package = pkgs.vscodium;
+          enableUpdateCheck = false;
+          extensions = with pkgs.vscode-extensions; [
+            bbenoist.nix
+            ms-python.python
+            kamadorueda.alejandra
+            #samuelcolvin.jinjahtml
+            editorconfig.editorconfig
+            #KnisterPeter.vscode-github
+            yzhang.markdown-all-in-one
+            redhat.vscode-yaml
+            pkief.material-icon-theme
+            mhutchie.git-graph
+            rust-lang.rust-analyzer
+            bungcip.better-toml
+          ];
+          userSettings = {
+            "git.autofetch" = true;
+            "update.mode" = "none";
+            "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
+            "editor.fontLigatures" = true;
+            "editor.formatOnSave" = true;
+            "editor.formatOnSaveMode" = "modificationsIfAvailable";
+            "editor.minimap.autohide" = true;
+            "diffEditor.diffAlgorithm" = "advanced";
+            "explorer.excludeGitIgnore" = true;
+            "markdown.extension.tableFormatter.normalizeIndentation" = true;
+            "markdown.extension.toc.orderedList" = false;
+            "telemetry.telemetryLevel" = "off";
+            "redhat.telemetry.enabled" = false;
+            "workbench.startupEditor" = "readme";
+            "workbench.enableExperiments" = false;
+            "workbench.iconTheme" = "material-icon-theme";
+            "rust-analyzer.checkOnSave.command" = "clippy";
+            "extensions.autoUpdate" = false;
+            "extensions.autoCheckUpdates" = false;
+          };
+        };
+
+        direnv = {
+          enable = true;
+          nix-direnv.enable = true;
+        };
+
+        chromium = {
+          enable = true;
+          extensions = [
+            {
+              # ublock origin
+              id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+            }
+            {
+              id = "dcpihecpambacapedldabdbpakmachpb";
+              updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
+            }
+          ];
+        };
+
+        exa = {
+          enable = true;
+          git = true;
+          icons = true;
+          enableAliases = true;
+          extraOptions = [
+            "--group-directories-first"
+            "--header"
+          ];
+        };
+
+        micro = {
+          enable = true;
+          settings = {
+            colorcolumn = 120;
+            hlsearch = true;
+            savecursor = true;
+            saveundo = true;
+            scrollbar = true;
+            smartpaste = true;
+          };
+        };
+
+        # checked https://rycee.gitlab.io/home-manager/options.html until "programs.notmuch"
       };
 
-      history = {
+      editorconfig = {
-        size = 10000;
-        path = "${config.xdg.dataHome}/zsh/history";
-        expireDuplicatesFirst = true;
-      };
-
-      oh-my-zsh = {
         enable = true;
-        theme = "agnoster";
+        settings = {
-        plugins = ["git" "sudo" "docker" "systemadmin" "thefuck"];
+          "*" = {
+            charset = "utf-8";
+            end_of_line = "lf";
+            trim_trailing_whitespace = true;
+            insert_final_newline = true;
+            max_line_width = 120;
+            indent_style = "space";
+            indent_size = 4;
+          };
+          "*.nix" = {
+            indent_size = 2;
+          };
+        };
       };
-    };
+    }
-
+    (lib.mkIf isGnomeEnabled {
-    git = {
+      home.packages = with pkgs; [
-      enable = true;
+        fractal
-      userName = "Vinzenz Schroeter";
-      userEmail = "vinzenz.f.s@gmail.com";
-
-      aliases = {
-        prettylog = "log --pretty=oneline --graph";
-        spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
-      };
-
-      extraConfig = {
-        pull.ff = "only";
-        merge.tool = "kdiff3";
-        push.autoSetupRemote = "true";
-      };
-    };
-
-    vscode = {
-      enable = true;
-      package = pkgs.vscodium;
-      enableUpdateCheck = false;
-      extensions = with pkgs.vscode-extensions; [
-        bbenoist.nix
-        ms-python.python
-        kamadorueda.alejandra
-        #samuelcolvin.jinjahtml
-        editorconfig.editorconfig
-        #KnisterPeter.vscode-github
-        yzhang.markdown-all-in-one
-        redhat.vscode-yaml
-        pkief.material-icon-theme
-        mhutchie.git-graph
-        rust-lang.rust-analyzer
-        bungcip.better-toml
       ];
-      userSettings = {
+    })
-        "git.autofetch" = true;
+  ]
-        "update.mode" = "none";
-        "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
-        "editor.fontLigatures" = true;
-        "editor.formatOnSave" = true;
-        "editor.formatOnSaveMode" = "modificationsIfAvailable";
-        "editor.minimap.autohide" = true;
-        "diffEditor.diffAlgorithm" = "advanced";
-        "explorer.excludeGitIgnore" = true;
-        "markdown.extension.tableFormatter.normalizeIndentation" = true;
-        "markdown.extension.toc.orderedList" = false;
-        "telemetry.telemetryLevel" = "off";
-        "redhat.telemetry.enabled" = false;
-        "workbench.startupEditor" = "readme";
-        "workbench.enableExperiments" = false;
-        "workbench.iconTheme" = "material-icon-theme";
-        "rust-analyzer.checkOnSave.command" = "clippy";
-        "extensions.autoUpdate" = false;
-        "extensions.autoCheckUpdates" = false;
-      };
-    };
-
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
-
-    chromium = {
-      enable = true;
-      extensions = [
-        {
-          # ublock origin
-          id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-        }
-        {
-          id = "dcpihecpambacapedldabdbpakmachpb";
-          updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
-        }
-      ];
-    };
-
-    exa = {
-      enable = true;
-      git = true;
-      icons = true;
-      enableAliases = true;
-      extraOptions = [
-        "--group-directories-first"
-        "--header"
-      ];
-    };
-
-    micro = {
-      enable = true;
-      settings = {
-        colorcolumn = 120;
-        hlsearch = true;
-        savecursor = true;
-        saveundo = true;
-        scrollbar = true;
-        smartpaste = true;
-      };
-    };
-
-    # checked https://rycee.gitlab.io/home-manager/options.html until "programs.notmuch"
-  };
-
-  editorconfig = {
-    enable = true;
-    settings = {
-      "*" = {
-        charset = "utf-8";
-        end_of_line = "lf";
-        trim_trailing_whitespace = true;
-        insert_final_newline = true;
-        max_line_width = 120;
-        indent_style = "space";
-        indent_size = 4;
-      };
-      "*.nix" = {
-        indent_size = 2;
-      };
-    };
-  };
-}