From 64baa2e7733e4b94078dc13082a39275d3e1d21a Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 16 Mar 2025 10:43:14 +0100 Subject: [PATCH] merge users with home --- home/ronja/configuration.nix | 56 +++++++++++++++++++++ home/ronja/default.nix | 75 +++++++++------------------- home/vinzenz/default.nix | 58 ++++++++++++++++----- home/vinzenz/waybar.nix | 2 +- hosts/vinzenz-lpt2/configuration.nix | 2 - hosts/vinzenz-lpt2/imports.nix | 5 +- hosts/vinzenz-pc2/imports.nix | 4 +- users/ronja.nix | 23 --------- users/vinzenz.nix | 36 ------------- 9 files changed, 131 insertions(+), 130 deletions(-) create mode 100644 home/ronja/configuration.nix delete mode 100644 users/ronja.nix delete mode 100644 users/vinzenz.nix diff --git a/home/ronja/configuration.nix b/home/ronja/configuration.nix new file mode 100644 index 0000000..85f4772 --- /dev/null +++ b/home/ronja/configuration.nix @@ -0,0 +1,56 @@ +{ config, pkgs, ... }: +{ + config = { + home.packages = with pkgs; [ + ## Apps + telegram-desktop + kdiff3 + ]; + + programs = { + home-manager.enable = true; + + zsh = { + history = { + size = 10000; + path = "${config.xdg.dataHome}/zsh/history"; + expireDuplicatesFirst = true; + }; + + oh-my-zsh = { + enable = true; + theme = "agnoster"; + plugins = [ + "git" + "sudo" + "systemadmin" + ]; + }; + }; + + git = { + userName = "Ronja Spiegelberg"; + userEmail = "ronja.spiegelberg@gmail.com"; + + extraConfig = { + pull.ff = "only"; + merge.tool = "kdiff3"; + }; + }; + + chromium = { + enable = true; + extensions = [ + { + # ublock origin + id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; + } + { + id = "dcpihecpambacapedldabdbpakmachpb"; + updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml"; + } + ]; + }; + }; + }; +} diff --git a/home/ronja/default.nix b/home/ronja/default.nix index b4bebd0..46aa848 100644 --- a/home/ronja/default.nix +++ b/home/ronja/default.nix @@ -1,57 +1,28 @@ -inputs@{ config, pkgs, ... }: +{ pkgs, ... }: { - imports = [ ./vscode.nix ]; - config.home-manager.users.ronja = { - home.packages = with pkgs; [ - ## Apps - telegram-desktop - kdiff3 + config = { + # Define user account + users.users.ronja = { + isNormalUser = true; + name = "ronja"; + description = "Ronja"; + home = "/home/ronja"; + extraGroups = [ + "networkmanager" + "wheel" + "games" + "podman" + ]; + shell = pkgs.zsh; + }; + + home-manager.users.ronja.imports = [ + ./configuration.nix + ./vscode.nix ]; - programs = { - home-manager.enable = true; - - zsh = { - history = { - size = 10000; - path = "${config.xdg.dataHome}/zsh/history"; - expireDuplicatesFirst = true; - }; - - oh-my-zsh = { - enable = true; - theme = "agnoster"; - plugins = [ - "git" - "sudo" - "systemadmin" - ]; - }; - }; - - git = { - userName = "Ronja Spiegelberg"; - userEmail = "ronja.spiegelberg@gmail.com"; - - extraConfig = { - pull.ff = "only"; - merge.tool = "kdiff3"; - }; - }; - - chromium = { - enable = true; - extensions = [ - { - # ublock origin - id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - } - { - id = "dcpihecpambacapedldabdbpakmachpb"; - updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml"; - } - ]; - }; - }; + allowedUnfreePackages = [ + "vscode-extension-ms-vscode-remote-remote-ssh" + ]; }; } diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 695270b..5d68bfc 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -1,14 +1,48 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { - imports = [ - ./configuration.nix - ./editorconfig.nix - ./git.nix - ./gnome.nix - ./niri.nix - ./ssh.nix - ./vscode.nix - ./waybar.nix - ./zsh.nix - ]; + config = { + users.users.vinzenz = { + isNormalUser = true; + name = "vinzenz"; + description = "Vinzenz"; + home = "/home/vinzenz"; + extraGroups = [ + "networkmanager" + "wheel" + "games" + "dialout" + "podman" + "nginx" + "adbusers" + "kvm" + "input" + ]; + shell = pkgs.zsh; + autoSubUidGidRange = true; + }; + + home-manager.users.vinzenz.imports = [ + ./configuration.nix + ./editorconfig.nix + ./git.nix + ./gnome.nix + ./niri.nix + ./ssh.nix + ./vscode.nix + ./waybar.nix + ./zsh.nix + ]; + + allowedUnfreePackages = [ + "vscode-extension-ms-vscode-remote-remote-ssh" + "insync" + "insync-pkg" + + "rider" + "pycharm-professional" + "jetbrains-toolbox" + + "anydesk" + ]; + }; } diff --git a/home/vinzenz/waybar.nix b/home/vinzenz/waybar.nix index ae245a1..413036d 100644 --- a/home/vinzenz/waybar.nix +++ b/home/vinzenz/waybar.nix @@ -97,7 +97,7 @@ cpu = { "interval" = 1; "format" = - "{usage}%@{avg_frequency} " + "{usage:3}%@{avg_frequency:4} " + (builtins.getAttr device { "vinzenz-lpt2" = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}{icon16}{icon17}{icon18}{icon19}"; diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix index d880b42..7ad1351 100644 --- a/hosts/vinzenz-lpt2/configuration.nix +++ b/hosts/vinzenz-lpt2/configuration.nix @@ -18,8 +18,6 @@ # Configure console keymap console.keyMap = "de"; - home-manager.users.vinzenz = import ../../home/vinzenz; - users.users.vinzenz.openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH'' ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming'' diff --git a/hosts/vinzenz-lpt2/imports.nix b/hosts/vinzenz-lpt2/imports.nix index 2526b3f..7e9f61a 100644 --- a/hosts/vinzenz-lpt2/imports.nix +++ b/hosts/vinzenz-lpt2/imports.nix @@ -1,7 +1,5 @@ { imports = [ - ../../users/vinzenz.nix - ../../modules/gnome.nix ../../modules/gaming.nix ../../modules/printing.nix @@ -9,5 +7,8 @@ ../../modules/niri.nix ../../modules/desktop-environment.nix ../../modules/desktop-hardware.nix + + ../../home/vinzenz + ../../home/ronja ]; } diff --git a/hosts/vinzenz-pc2/imports.nix b/hosts/vinzenz-pc2/imports.nix index 2526b3f..cf430db 100644 --- a/hosts/vinzenz-pc2/imports.nix +++ b/hosts/vinzenz-pc2/imports.nix @@ -1,7 +1,5 @@ { imports = [ - ../../users/vinzenz.nix - ../../modules/gnome.nix ../../modules/gaming.nix ../../modules/printing.nix @@ -9,5 +7,7 @@ ../../modules/niri.nix ../../modules/desktop-environment.nix ../../modules/desktop-hardware.nix + + ../../home/vinzenz ]; } diff --git a/users/ronja.nix b/users/ronja.nix deleted file mode 100644 index 3ed2b8a..0000000 --- a/users/ronja.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, ... }: -{ - config = { - # Define user account - users.users.ronja = { - isNormalUser = true; - name = "ronja"; - description = "Ronja"; - home = "/home/ronja"; - extraGroups = [ - "networkmanager" - "wheel" - "games" - "podman" - ]; - shell = pkgs.zsh; - }; - - allowedUnfreePackages = [ - "vscode-extension-ms-vscode-remote-remote-ssh" - ]; - }; -} diff --git a/users/vinzenz.nix b/users/vinzenz.nix deleted file mode 100644 index aeb4926..0000000 --- a/users/vinzenz.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, ... }: -{ - config = { - users.users.vinzenz = { - isNormalUser = true; - name = "vinzenz"; - description = "Vinzenz"; - home = "/home/vinzenz"; - extraGroups = [ - "networkmanager" - "wheel" - "games" - "dialout" - "podman" - "nginx" - "adbusers" - "kvm" - "input" - ]; - shell = pkgs.zsh; - autoSubUidGidRange = true; - }; - - allowedUnfreePackages = [ - "vscode-extension-ms-vscode-remote-remote-ssh" - "insync" - "insync-pkg" - - "rider" - "pycharm-professional" - "jetbrains-toolbox" - - "anydesk" - ]; - }; -}