diff options
author | Rory& <root@rory.gay> | 2024-07-04 14:59:36 +0200 |
---|---|---|
committer | Rory& <root@rory.gay> | 2024-07-04 14:59:36 +0200 |
commit | dd7b872694441a96b8b042ccbc4b63a96d0b89b9 (patch) | |
tree | 76a25875e08415c38cdb7b5ad8f93241b387d078 /modules/users | |
parent | Update flake inputs (diff) | |
download | Rory-Open-Architecture-dd7b872694441a96b8b042ccbc4b63a96d0b89b9.tar.xz |
Nixfmt
Diffstat (limited to 'modules/users')
-rwxr-xr-x | modules/users/Alice.nix | 7 | ||||
-rwxr-xr-x | modules/users/Rory.client.nix | 23 | ||||
-rwxr-xr-x | modules/users/Rory.nix | 41 | ||||
-rwxr-xr-x | modules/users/chris.nix | 5 | ||||
-rwxr-xr-x | modules/users/db2k.nix | 7 | ||||
-rw-r--r-- | modules/users/groups/BugMine-contrib.nix | 2 | ||||
-rwxr-xr-x | modules/users/ks.nix | 18 | ||||
-rwxr-xr-x | modules/users/levi.nix | 3 |
8 files changed, 57 insertions, 49 deletions
diff --git a/modules/users/Alice.nix b/modules/users/Alice.nix index e2e343a..465754a 100755 --- a/modules/users/Alice.nix +++ b/modules/users/Alice.nix @@ -2,16 +2,13 @@ { imports = [ groups/BugMine-contrib.nix ]; - users.groups.Alice = {}; + users.groups.Alice = { }; users.users.Alice = { isSystemUser = true; extraGroups = [ "BugMine-contrib" ]; group = "Alice"; home = "/group/bugmine-contrib"; shell = "${pkgs.git}/bin/git-shell"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb52m1rnJSffSOJvN6OYkKgK0TmiRKE4SbOKlkT8Tvn" - ]; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb52m1rnJSffSOJvN6OYkKgK0TmiRKE4SbOKlkT8Tvn" ]; }; } - diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix index b74bbd9..ec1692c 100755 --- a/modules/users/Rory.client.nix +++ b/modules/users/Rory.client.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, home-manager, ... }: +{ + config, + lib, + pkgs, + home-manager, + ... +}: { programs = { @@ -12,8 +18,8 @@ services.gnome-keyring.enable = lib.mkForce false; dconf.settings = { "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; }; }; # keepassxc, maybe? @@ -23,24 +29,24 @@ # #After = [ "graphical-session-pre.target" ]; # PartOf = [ "default.target" ]; # }; -# + # # Install = { WantedBy = [ "default.target" ]; }; -# + # # Service = { # ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx"; # Restart = "always"; # }; #}; -# + # #systemd.user.services.easyeffects = { # Unit = { # Description = "EasyEffects"; # #After = [ "graphical-session-pre.target" ]; # PartOf = [ "default.target" ]; # }; -# + # # Install = { WantedBy = [ "default.target" ]; }; -# + # # Service = { # ExecStart = "${pkgs.easyeffects}/bin/easyeffects"; # Restart = "always"; @@ -50,4 +56,3 @@ home.stateVersion = "22.11"; }; } - diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix index a31e8c2..5e09c09 100755 --- a/modules/users/Rory.nix +++ b/modules/users/Rory.nix @@ -1,9 +1,19 @@ -{ config, lib, pkgs, home-manager, ... }: +{ + config, + lib, + pkgs, + home-manager, + ... +}: { users.users.Rory = { isNormalUser = true; - extraGroups = [ "wheel" "libvirtd" "ocp" ]; + extraGroups = [ + "wheel" + "libvirtd" + "ocp" + ]; packages = with pkgs; [ lnav age @@ -44,14 +54,14 @@ EDITOR = "nvim"; SYSTEMD_EDITOR = "nvim"; GIT_EDITOR = "nvim"; - QT_QPA_PLATFORMTHEME="xdgdesktopportal"; - GTK_USE_PORTAL="1"; - _JAVA_AWT_WM_NONREPARENTING="1"; - WINEDEBUG="-all"; - CHOKIDAR_USEPOLLING="true"; - MSBUILDLIVELOGGER="auto"; - DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER="1"; - DOTNET_CLI_TELEMETRY_OPTOUT="1"; + QT_QPA_PLATFORMTHEME = "xdgdesktopportal"; + GTK_USE_PORTAL = "1"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + WINEDEBUG = "-all"; + CHOKIDAR_USEPOLLING = "true"; + MSBUILDLIVELOGGER = "auto"; + DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER = "1"; + DOTNET_CLI_TELEMETRY_OPTOUT = "1"; NIXPKGS_ALLOW_UNFREE = "1"; MOZ_USE_XINPUT2 = "1"; }; @@ -99,7 +109,7 @@ export DISABLE_AUTO_UPDATE=true COMPLETION_WAITING_DOTS="true" - ''; + ''; initExtra = '' alias mv='mv -v' alias pre='npx prettier -w' @@ -115,15 +125,15 @@ alias transfetch='neofetch --kitty ~/trans_witch.jpg' alias gc='git-commit' [ -f "$HOME/.profile" ] && . $HOME/.profile - ''; - #alias knconfig='cp .config ../$(date ''+%Y%m%d_%k%M%S\'').config -v; make CC=clang LLVM=1 nconfig' + ''; + #alias knconfig='cp .config ../$(date ''+%Y%m%d_%k%M%S\'').config -v; make CC=clang LLVM=1 nconfig' oh-my-zsh = { enable = true; plugins = [ "git" "sudo" ]; - }; + }; plugins = [ { @@ -189,7 +199,7 @@ vimdiffAlias = true; coc = { enable = true; - + }; }; }; @@ -205,4 +215,3 @@ home.stateVersion = "22.11"; }; } - diff --git a/modules/users/chris.nix b/modules/users/chris.nix index 86acee5..3ab5d98 100755 --- a/modules/users/chris.nix +++ b/modules/users/chris.nix @@ -10,9 +10,6 @@ nodejs-slim ]; #initialPassword = "password"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd9U0+wKjBG3Q9Qg249xJY+ybYeRV9/VMPjuwKvFBEI" - ]; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd9U0+wKjBG3Q9Qg249xJY+ybYeRV9/VMPjuwKvFBEI" ]; }; } - diff --git a/modules/users/db2k.nix b/modules/users/db2k.nix index a6dc7cd..65457a4 100755 --- a/modules/users/db2k.nix +++ b/modules/users/db2k.nix @@ -1,16 +1,13 @@ { config, pkgs, ... }: { - users.groups.db2k = {}; + users.groups.db2k = { }; users.users.db2k = { isSystemUser = true; extraGroups = [ "ocp" ]; group = "db2k"; home = "/data/nginx/html_git/.ocp"; shell = "${pkgs.git}/bin/git-shell"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMfXA4Oh0LZqY8LAS/lnANKVDBlemHGPWdtep1GE/LId garyzipperer09@gmail.com" - ]; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMfXA4Oh0LZqY8LAS/lnANKVDBlemHGPWdtep1GE/LId garyzipperer09@gmail.com" ]; }; } - diff --git a/modules/users/groups/BugMine-contrib.nix b/modules/users/groups/BugMine-contrib.nix index 636afba..3b3ce07 100644 --- a/modules/users/groups/BugMine-contrib.nix +++ b/modules/users/groups/BugMine-contrib.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: { - users.groups.BugMine-contrib = {}; + users.groups.BugMine-contrib = { }; } diff --git a/modules/users/ks.nix b/modules/users/ks.nix index 878e55b..1039fd1 100755 --- a/modules/users/ks.nix +++ b/modules/users/ks.nix @@ -1,16 +1,21 @@ -{ config, pkgs, home-manager, ... }: +{ + config, + pkgs, + home-manager, + ... +}: { users.users.ks = { isNormalUser = true; - extraGroups = [ "wheel" "ocp" ]; - packages = with pkgs; [ + extraGroups = [ + "wheel" + "ocp" ]; + packages = with pkgs; [ ]; #initialPassword = "password"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUDh1WPUF6mPQ1E38ozUjY/DZhEbwZL37eZ51DgpuLo ks" - ]; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUDh1WPUF6mPQ1E38ozUjY/DZhEbwZL37eZ51DgpuLo ks" ]; }; home-manager.users.ks = { @@ -28,4 +33,3 @@ home.stateVersion = "22.11"; }; } - diff --git a/modules/users/levi.nix b/modules/users/levi.nix index bb28656..8112df2 100755 --- a/modules/users/levi.nix +++ b/modules/users/levi.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - users.groups.levi = {}; + users.groups.levi = { }; users.users.levi = { isSystemUser = true; extraGroups = [ "ocp" ]; @@ -15,4 +15,3 @@ ]; }; } - |