Add gnome-keyring for keyring support

.gitignore

@@ -1,5 +1,7 @@
 ./result/
 result/
-./result 
+./result
 ./result/*
 hardware-configuration.nix
+result
+profile.nix

applications/matrix-element.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+let
+    profile = import ./profile.nix;
+in
+{
+    environment.systemPackages = with pkgs; [
+        element-desktop
+    ];
+}

applications/open-modelica.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+let
+    profile = import ./profile.nix;
+in
+{
+    environment.systemPackages = with pkgs; [
+        openmodelica.combined
+    ];
+}

configuration.nix

@@ -3,7 +3,9 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
-
+let
+    profile = import ./profile.nix;
+in
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -16,7 +18,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "amelia"; # Define your hostname.
+  networking.hostName = profile.hostname; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking

desktop-environment/config.nix

@@ -1,17 +1,19 @@
 { pkgs, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
     imports  = [
         ./browser.nix
         ./planner.nix
         ./window-manager.nix
+        ../applications/matrix-element.nix
     ];
 
     environment.systemPackages = with pkgs; [
         kitty
-        evolution
         pamixer
-        nerd-fonts.open-dyslexic
         nemo-with-extensions
     ];
 
@@ -24,7 +26,7 @@
       settings = {
         default_session = {
           command = "Hyprland";
-          user = "nichkara";
+          user = profile.username;
         };
       };
     };

desktop-environment/planner.nix

@@ -23,8 +23,6 @@ in
             DisableTelemetry = true;
             DisableAppUpdate = true;
 
-            EnableOpenPGP = true;
-
             Preferences = {
                 "mail.provider.enabled" = false;
                 "mail.openpgp.allow_external_gnupg" = true;
@@ -34,6 +32,17 @@ in
             Certificates = {
                 ImportEnterpriseRoots = true;
             };
+
+            PasswordManagerEnabled = true;
+            Cookies = {
+                "Default" = false;
+                "AcceptThirdParty" = "never";
+                "Locked" = true;
+            };
+
+            DefaultDownloadDirectory = "/tmp";
+            DisableBuiltinPDFViewer = true;
+            DisablePasswordReveal = true;
         };
     };
 }

desktop-environment/window-manager.nix

@@ -1,35 +1,9 @@
 { pkgs, lib, ... }:
 let
-    dotfiles_hypr = pkgs.fetchgit {
-        url = "https://git.nichkara.eu/dotfiles/hypr";
-        rev = "96f9ca03450049baffbc8a2b71c3a40367edd2a5";
-        sha256 = "sha256-dHxf2UNEDC/KyDgjMMQ988hyGM2gasYNbNtLTityhDY=";
-    };
+    profile = import ../profile.nix;
 in
 {
-    environment.systemPackages = with pkgs; [
-        wofi
-        waybar
-        grim
-        swaynotificationcenter
-        swaylock
-        hyprpaper
-        lxsession
-        hyprshot
-        wayvnc
+    imports = [
+        ./window-manager/${profile.interface}.nix
     ];
-
-    programs.hyprland = {
-        enable = true;
-        withUWSM = true;
-        xwayland.enable = true;
-    };
-
-    home-manager.users.nichkara = { ... }: {
-        home.file.".config/hypr" = {
-        source = dotfiles_hypr;
-        recursive = true;
-        };
-    };
-
 }

desktop-environment/window-manager/hyprland.nix

@@ -0,0 +1,60 @@
+{ pkgs, lib, ... }:
+let
+    dotfiles_hypr = pkgs.fetchgit {
+        url = "https://git.nichkara.eu/dotfiles/hypr";
+        rev = "83da92f0d64620c6503b8b2d9fa27bd79816e025";
+        sha256 = "sha256-kEKJiH0oK0PuciJZ6ucinTKX5eMWxPPZXYNS1+HIcRA=";
+    };
+
+    dotfiles_waybar = pkgs.fetchgit {
+        url = "https://git.nichkara.eu/dotfiles/waybar";
+        rev = "47a5d2b7795fcdb26bff3a91864d19158cfc5c5c";
+        sha256 = "sha256-0S0S+qIEa20GWeHGEOzji6rPQPPzDvyZFpyHewLuxKw=";
+    };
+
+    profile = import ../../profile.nix;
+in
+{
+
+    environment.systemPackages = with pkgs; [
+        wofi
+        grim
+        swaynotificationcenter
+        swaylock
+        hyprpaper
+        lxsession
+        hyprshot
+        wayvnc
+        pamixer
+        pavucontrol
+        brightnessctl
+    ];
+
+    fonts.packages = with pkgs; [
+            nerd-fonts.space-mono
+        ];
+
+    programs.hyprland = {
+        enable = true;
+        withUWSM = true;
+        xwayland.enable = true;
+    };
+
+    programs.waybar = {
+        enable = true;
+    };
+
+    home-manager.users.${profile.username} = { ... }: {
+        home.file.".config/hypr" = {
+            source = dotfiles_hypr;
+            recursive = true;
+        };
+
+        home.file.".config/waybar" = {
+            source = dotfiles_waybar;
+            recursive = true;
+        };
+
+    };
+
+}

home-manager.nix

@@ -1,6 +1,8 @@
 { config, pkgs, lib, ... }:
-
 let
+    profile = import ./profile.nix;
+    home-directory = "/home/${profile.username}";
+    ssh-filename = "${home-directory}/.ssh/id_ed25519";
 in
 {
 
@@ -11,17 +13,18 @@ in
         ./system-environment/config.nix
     ];
 
-    users.users.nichkara = {
+    users.users.${profile.username} = {
         isNormalUser = true;
         description = "Nina Chloé Kassandra";
         extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp"];
         packages = with pkgs; [];
         shell = pkgs.zsh;
+	hashedPassword = profile.hashed-password;
     };
 
     home-manager.backupFileExtension = "bck.lck";
 
-    home-manager.users.nichkara = { pkgs, ... }: {
+    home-manager.users.${profile.username} = { pkgs, ... }: {
         home.stateVersion = "25.11";
         programs.git = {
             enable = true;
@@ -35,5 +38,45 @@ in
                 };
             };
         };
+
+        programs.ssh = {
+          enable = true;
+
+          extraConfig = ''
+            Host git.nickr.eu
+                HostName git.nickr.eu
+                Port 22
+
+            Host nickr.eu
+                HostName nickr.eu
+                Port 222
+
+            Host nichkara.eu
+                HostName nichkara.eu
+                Port 222
+
+            Host git.nichkara.eu
+                HostName git.nichkara.eu
+                Port 22
+          '';
+        };
     };
+
+    systemd.services.generate-ssh-key = {
+    	description = "Generate SSH key if missing";
+    	wantedBy = [ "multi-user.target" ];
+    	after = [ "network.target" ];
+    	serviceConfig = {
+		Type = "oneshot";
+      		User = profile.username;
+    };
+
+    script = ''
+      if [ ! -f ${ssh-filename} ]; then
+        mkdir -p ${home-directory}/.ssh
+        chmod 700 ${home-directory}/.ssh
+        ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -N "" -f ${ssh-filename}
+      fi
+    '';
+  };
 }

home/hypr/config/keymaps.nix

@@ -1,124 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-wayland.windowManager.hyprland = {
-        settings = {
-
-            "$terminal" = "kitty";
-            "$fileManager" = "dolphin";
-            "$menu" = "rofi -show drun -show-icons";
-            "$editor" = "kate";
-            "$browser" = "vivaldi";
-
-            "$mainMod" = "SUPER";
-
-            bind = [
-                "$mainMod, Q, exec, kitty"
-                "$mainMod, E, exec, $fileManager"
-                "$mainMod, K, exec, $editor"
-                "$mainMod, B, exec, $browser"
-                "$mainMod, S, exec, $menu"
-                "$mainMod ALT, E, exec, dolphin /run/media/skadi/Volume/Dokumente"
-
-                # Util
-                "$mainMod, C, killactive,"
-                "$mainMod, M, exit,"
-                "$mainMod, V, togglefloating,"
-                "$mainMod, P, pseudo" #dwindle
-                "$mainMod, J, togglesplit" #dwindle
-                "$mainMod, L, exec, ~/.config/home-manager/hypr/wallpaper.sh"
-                "$mainMod, H, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
-
-                ", PRINT, exec, hyprshot -m region"
-                "$mainMod, PRINT, exec, hyprshot -m window"
-
-                # Move focus with mainMod + arrow keys
-                "$mainMod, left, movefocus, l"
-                "$mainMod, right, movefocus, r"
-                "$mainMod, up, movefocus, u"
-                "$mainMod, down, movefocus, d"
-
-                # Switch workspaces with mainMod + [0-9]
-                "$mainMod, 1, workspace, 1"
-                "$mainMod, 2, workspace, 2"
-                "$mainMod, 3, workspace, 3"
-                "$mainMod, 4, workspace, 4"
-                "$mainMod, 5, workspace, 5"
-                "$mainMod, 6, workspace, 6"
-                "$mainMod, 7, workspace, 7"
-                "$mainMod, 8, workspace, 8"
-                "$mainMod, 9, workspace, 9"
-                "$mainMod, 0, workspace, 10"
-
-                # Move active window to a workspace with mainMod + SHIFT + [0-9]
-                "$mainMod SHIFT, 1, movetoworkspace, 1"
-                "$mainMod SHIFT, 2, movetoworkspace, 2"
-                "$mainMod SHIFT, 3, movetoworkspace, 3"
-                "$mainMod SHIFT, 4, movetoworkspace, 4"
-                "$mainMod SHIFT, 5, movetoworkspace, 5"
-                "$mainMod SHIFT, 6, movetoworkspace, 6"
-                "$mainMod SHIFT, 7, movetoworkspace, 7"
-                "$mainMod SHIFT, 8, movetoworkspace, 8"
-                "$mainMod SHIFT, 9, movetoworkspace, 9"
-                "$mainMod SHIFT, 0, movetoworkspace, 10"
-
-                # Scroll through existing workspaces with mainMod + scroll
-                "$mainMod, mouse_down, workspace, e+1"
-                "$mainMod, mouse_up, workspace, e-1"
-            ];
-
-            #mouse keys
-            bindm = [
-                # Move/resize windows with mainMod + LMB/RMB and dragging
-                "$mainMod, mouse:272, movewindow"
-                "$mainMod, mouse:273, resizewindow"
-
-            ];
-
-            #laptop keys
-            bindl = [
-                ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-                ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-                ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-
-            ];
-            };
-
-            # Submaps
-            extraConfig = ''
-                # Resize
-
-                bind = ALT, R, submap, Resize
-                submap = Resize
-                binde = , right, resizeactive, 10 0
-                binde = , left, resizeactive, -10 0
-                binde = , up, resizeactive, 0 -10
-                binde = , down, resizeactive, 0 10
-                # escape the submap
-                bind = , escape, submap, reset
-                submap = reset
-
-                # Move
-
-                bind = ALT, T, submap, Move
-                submap = Move
-                bindm = , mouse:272, movewindow
-                bindm = , mouse:273, resizewindow
-                bind = , escape, submap, reset
-                submap = reset
-
-                # Close
-
-                bind = ALT, Z, submap, Close
-                submap = Close
-                bind = , C, killactive,
-                bind = , escape, submap, reset
-                submap = reset
-            '';
-
-
-
-
-    };
-
-}

home/hypr/hyprland.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-    imports = [
-    ];
-}

profile.nix.template

@@ -0,0 +1,12 @@
+{
+    username = "nichkara";
+    hostname = "amelia";
+    hashed-password = "$y$j9T$W72kGNL9hSTiN7CjnUpqH1$uyE1OzYN4kvbhhylX7pwRmLYYYmouRPVGIDZKwx8YW8";
+    interface = "hyprland";
+    modules = {
+        base = true;
+        office = false;
+        development = false;
+        science = false;
+    };
+}

system-environment/config.nix

@@ -1,13 +1,20 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
     imports = [
         ./file-system.nix
+        ./media.nix
+        ./security/keyring.nix
     ];
 
     environment.systemPackages = with pkgs; [
-        # Make systems
         gnumake
+        python3
+    ]
+    ++ lib.optionals profile.modules.development [
         cmake
         cmakeCurses
 

system-environment/file-system.nix

@@ -3,12 +3,17 @@
 
     environment.systemPackages = with pkgs; [
         nextcloud-client
-        calibre
         unzip
+        deja-dup
+        gnutar
+        xz
+        gzip
+        gz-utils
+        file
+        fileinfo
     ];
 
     environment.variables = {
     };
 
-
 }

system-environment/media.nix

@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+{
+
+    environment.systemPackages = with pkgs; [
+        calibre
+        kdePackages.okular
+        vlc
+        totem
+        w3m
+        epr
+    ];
+
+    environment.variables = {
+    };
+
+
+}

system-environment/security/keyring.nix

@@ -0,0 +1,18 @@
+{ pkgs, lib, ... }:
+let
+    profile = import ../profile.nix;
+in
+{
+
+    imports = [ ];
+
+    environment.systemPackages = with pkgs; [
+        seahorse
+    ];
+
+    environment.variables = {
+    };
+
+    services.gnome.gnome-keyring.enable = true;
+    security.pam.services.login.enableGnomeKeyring = true;
+}

terminal-environment/config.nix

@@ -1,23 +1,19 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
+let
+    profile = import ../profile.nix;
+in
 {
 
+   imports = [
+      ./editor.nix
+   ];
+
     environment.systemPackages = with pkgs; [
-        vim
-        neovim
         astyle
-        python313Packages.pynvim
         hyfetch
-        fzf
         fzf-zsh
-        ripgrep
-        ripgrep-all
     ];
 
-    environment.variables = {
-        EDITOR = "nvim";
-    };
-
-
     programs.tmux = {
         enable = true;
         clock24 = true;
@@ -64,7 +60,7 @@
         };
     };
 
-    home-manager.users.nichkara = { ... }: {
+    home-manager.users.${profile.username} = { ... }: {
         programs.zsh = {
             enable = true;
             enableCompletion = true;
@@ -84,7 +80,25 @@
                 ignorePatterns = [  ];
                 saveNoDups = true;
                 ignoreAllDups = true;
-                };
+            };
+
+            oh-my-zsh = {
+                enable = true;
+                theme = "sonicradish";
+                plugins = [
+                    "git"
+                    "z"
+                    "dotenv"
+                    "battery"
+                    "emoji"
+                    "emoji-clock"
+                    "fzf"
+                    "kitty"
+                    "themes"
+                    "tmux"
+                    "vi-mode"
+                ];
+            };
 
             setOptions = [
                 "HIST_IGNORE_ALL_DUPS"

terminal-environment/editor.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+let
+    profile = import ../profile.nix;
+in
+{
+
+   environment.systemPackages = with pkgs; [
+      vim
+      fzf
+      ripgrep
+      ripgrep-all
+   ];
+
+   programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+      withPython3 = true;
+      withRuby = true;
+      withNodeJs = true;
+   };
+}