From d73ff173270ea406a0866b014ff975325071cef9 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sun, 4 May 2025 13:49:24 +0200 Subject: [PATCH] Delete deprecated .dotter files --- .dotter/global.toml | 61 ---------------------------- .dotter/kardorf.toml | 6 --- .dotter/laptop-at-home.toml | 4 -- .dotter/laptop.toml | 5 --- .dotter/local.kardorf.toml | 2 - .dotter/local.laptop.toml | 2 - hosts/common/users/wolfi/default.nix | 31 ++++++++++++++ 7 files changed, 31 insertions(+), 80 deletions(-) delete mode 100644 .dotter/global.toml delete mode 100644 .dotter/kardorf.toml delete mode 100644 .dotter/laptop-at-home.toml delete mode 100644 .dotter/laptop.toml delete mode 100644 .dotter/local.kardorf.toml delete mode 100644 .dotter/local.laptop.toml create mode 100644 hosts/common/users/wolfi/default.nix diff --git a/.dotter/global.toml b/.dotter/global.toml deleted file mode 100644 index 544e0e3..0000000 --- a/.dotter/global.toml +++ /dev/null @@ -1,61 +0,0 @@ -[helpers] - -[default] -depends = [] - -[manjaro.files] -manjaro = "~" - -[mc.files] -mc = "~/.config/mc" - -[vim.files] -# type symbolic prevents interpreting '{{' as template -"vim/.vimrc" = { target = "~/.vimrc", type = "symbolic" } - -[nvim.files] -"vim/init.vim" = { target = "~/.config/nvim/init.vim", type = "symbolic" } - -[i3.files] -"i3/i3" = "~/.config/i3" -"i3/i3blocks" = { target = "~/.config/i3blocks", type = "symbolic" } -"i3/rofi" = "~/.config/rofi" -"i3/i3-scrot.conf" = "~/.config/i3-scrot.conf" -"i3/i3status-rust" = "~/.config/i3status-rust" -"i3/.profile" = "~/.profile" - -[i3.variables] -monitor-primary = "not-specified" -monitor-secondary = "not-specified" -screenlayout-script = "echo screenlayout-script not specified" -bar-font-size = 15 -tray-output = "tray_output primary" - -[emacs.files] -"emacs/doom" = "~/.config/doom" -# "emacs/spacemacs/.spacemacs" = "~/.spacemacs" -# "emacs/chemacs/.emacs-profiles.el" = "~/.emacs-profiles.el" - -[alacritty.files] -alacritty = "~/.config/alacritty" - -[starship.files] -starship = "~/.config/" - -[zsh.files] -"zsh/.zshrc" = "~/.zshrc" -"zsh/custom-plugins" = "~/.oh-my-zsh/custom" - -[polybar.files] -polybar = "~/.config/polybar" - -[leftwm.files] -leftwm = "~/.config/leftwm" - -[xmonad.files] -xmonad = "~/.xmonad" - -[nix.files] -"direnvrc" = "~/.config/direnv/direnvrc" -"nix/configuration.nix" = "/etc/nixos/configuration.nix" -"nix/flake.nix" = "/etc/nixos/flake.nix" diff --git a/.dotter/kardorf.toml b/.dotter/kardorf.toml deleted file mode 100644 index fb87d55..0000000 --- a/.dotter/kardorf.toml +++ /dev/null @@ -1,6 +0,0 @@ -[i3.variables] -monitor-primary = "DVI-D-0" -monitor-secondary = "DVI-D-1" -screenlayout-script = "~/.screenlayout/2desktop-dvi.sh" -bar-font-size = 15 -tray-output = "tray_output DVI-D-1" diff --git a/.dotter/laptop-at-home.toml b/.dotter/laptop-at-home.toml deleted file mode 100644 index df9c655..0000000 --- a/.dotter/laptop-at-home.toml +++ /dev/null @@ -1,4 +0,0 @@ -[i3.variables] -monitor-primary = "HDMI-1" -monitor-secondary = "eDP-1" -screenlayout-script = "~/.screenlayout/laptop-at-home.sh" diff --git a/.dotter/laptop.toml b/.dotter/laptop.toml deleted file mode 100644 index 41bdb11..0000000 --- a/.dotter/laptop.toml +++ /dev/null @@ -1,5 +0,0 @@ -[i3.variables] -monitor-primary = "HDMI-1" -monitor-secondary = "eDP-1" -tray-output = "tray_output eDP-1" -screenlayout-script = "$scripts/display-layoutpicker" diff --git a/.dotter/local.kardorf.toml b/.dotter/local.kardorf.toml deleted file mode 100644 index db7af68..0000000 --- a/.dotter/local.kardorf.toml +++ /dev/null @@ -1,2 +0,0 @@ -includes = [".dotter/kardorf.toml"] -packages = ["i3", "emacs", "alacritty", "zsh", "starship", "nix"] diff --git a/.dotter/local.laptop.toml b/.dotter/local.laptop.toml deleted file mode 100644 index 80da18f..0000000 --- a/.dotter/local.laptop.toml +++ /dev/null @@ -1,2 +0,0 @@ -includes = [".dotter/laptop.toml"] -packages = [] diff --git a/hosts/common/users/wolfi/default.nix b/hosts/common/users/wolfi/default.nix new file mode 100644 index 0000000..1bb487d --- /dev/null +++ b/hosts/common/users/wolfi/default.nix @@ -0,0 +1,31 @@ +{ + pkgs, + config, + ... +}: +let + ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; +in +{ + users.mutableUsers = false; + users.users.wolfi = { + description = "Wolfi"; + group = "wolfi"; + isNormalUser = true; + shell = pkgs.fish; + extraGroups = ifTheyExist [ + "networkmanager" + "wheel" + "audio" + "network" + "video" + "podman" + "docker" + "git" + "gamemode" + ]; + + hashedPassword = "$y$j9T$ifzWjoZaRtPUOOfMYnbJ20$uFOO1EyDApL52vRUicZYgupaTA/a6sGNUj3imZ/lcb6"; + }; + users.groups.wolfi = { }; +}