diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/sw/swaybg/images/abstract-nord.png (renamed from modules/common/abstract-nord.png) | bin | 140219 -> 140219 bytes | |||
| -rw-r--r-- | modules/by-name/sw/swaybg/images/abstract-nord.png.license (renamed from modules/common/abstract-nord.png.license) | 0 | ||||
| -rw-r--r-- | modules/common/default.nix | 104 | ||||
| -rw-r--r-- | modules/common/nixos_shell_configuration.nix | 66 | ||||
| -rw-r--r-- | modules/common/projects.json | 72 |
5 files changed, 22 insertions, 220 deletions
diff --git a/modules/common/abstract-nord.png b/modules/by-name/sw/swaybg/images/abstract-nord.png Binary files differindex 5ef498bf..5ef498bf 100644 --- a/modules/common/abstract-nord.png +++ b/modules/by-name/sw/swaybg/images/abstract-nord.png diff --git a/modules/common/abstract-nord.png.license b/modules/by-name/sw/swaybg/images/abstract-nord.png.license index eae6a84c..eae6a84c 100644 --- a/modules/common/abstract-nord.png.license +++ b/modules/by-name/sw/swaybg/images/abstract-nord.png.license diff --git a/modules/common/default.nix b/modules/common/default.nix index aadb22bd..4855c7ab 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -13,17 +13,10 @@ config, pkgs, lib, - # Needed for nixos-shell - libraries, - modules, - openPRsNixpkgs, - packageSets, - system, - self, - externalDependencies, - externalBinaries, ... }: { + # TODO(@bpeetz): Move this file to default options in their respective modules. <2025-05-31> + soispha = { age.enable = true; boot.enable = true; @@ -48,49 +41,7 @@ ]; }; - nixos-shell = { - enable = lib.mkDefault true; - configuration = { - specialArgs = { - inherit - libraries - modules - ; - }; - value = lib.mkMerge [ - { - _module.args = { - inherit - # extra package sources - openPRsNixpkgs - packageSets - # extra information - system - # nix registry - self - externalDependencies - # bins - # TODO: Integrate these into `pkgs/by-name` <2024-05-22> - externalBinaries - ; - }; - } - - { - require = [ - ./nixos_shell_configuration.nix - - ../../modules - ../../modules/common - ]; - } - ]; - }; - mounts = {}; - }; - polkit.enable = true; - power.enable = true; xdg.enable = true; services = { @@ -145,33 +96,19 @@ config.home-manager.users.soispha.home.file); in [ - # TODO(@bpeetz): Move these to their respective modules <2025-05-09> - # Already synchronized by TaskChampion sync server - "~/.local/share/task" - # Already synchronized by atuin sync server - "~/.local/share/atuin" + # TODO(@bpeetz): Move that to its respective module (after migrating it to + # by-name) <2025-05-09> # Already synchronized by mbsync "~/.local/share/maildir" - - # Should not be synchronized - "~/.local/share/unison" - - # These are just to big to be synchronized (# TODO: Work around that <2024-08-31> ) - "~/media/music" - "~/.local/share/Steam" ] ++ homeManagerSymlinks; pathsToSync = [ - "~/.local/state/mpv" - "~/.local/state/nvim" "~/.local/share" "~/.local/.Trash-1000" - "~/.mozilla/firefox" - "~/media" - "~/school" + "~/documents" "~/repos" ]; }; @@ -181,6 +118,10 @@ i3bar-river.enable = true; i3status-rust.enable = true; + qutebrowser = { + enable = true; + }; + nvim = { enable = true; shell = pkgs.zsh; @@ -189,12 +130,12 @@ enable = true; enableAge = lib.mkDefault true; }; - cargo.enable = true; direnv.enable = true; git.enable = true; imv.enable = true; less.enable = true; lf.enable = true; + ly.enable = lib.mkDefault true; gpg.enable = true; river = { enable = lib.mkDefault true; @@ -231,12 +172,12 @@ title = "*"; action = "ssd"; } - # This remove the focus border around Firefox (which is useful because the Firefox is nearly always in its own tag.) - { - app-id = "firefox"; - title = "*"; - action = "csd"; - } + # # This remove the focus border around Firefox (which is useful because the Firefox is nearly always in its own tag.) + # { + # app-id = "firefox"; + # title = "*"; + # action = "csd"; + # } ]; generalSettings = { # background @@ -258,18 +199,8 @@ pointer-1133-49970-Logitech_Gaming_Mouse_G502 = [["pointer-accel" "0"] ["accel-profile" "none"]]; pointer-12951-6505-ZSA_Technology_Labs_Moonlander_Mark_I = [["pointer-accel" "0"] ["accel-profile" "none"]]; }; - backgroundStart = [ - # TODO(@bpeetz): Move these to systemd units/their own modules <2025-05-18> - pkgs.gammastep - - pkgs.mako - ["${lib.getExe pkgs.swaybg}" "--image" "${./abstract-nord.png}"] - pkgs.swayidle - pkgs.alacritty - ]; }; }; - firefox.enable = true; mpv.enable = true; steam.enable = true; ssh.enable = true; @@ -286,13 +217,12 @@ projects = builtins.fromJSON (builtins.readFile ./projects.json); }; nix-index.enable = true; - yambar.enable = false; yt.enable = true; zathura.enable = true; zsh.enable = true; + fish.enable = true; }; - sound.enable = true; version.enable = true; }; } diff --git a/modules/common/nixos_shell_configuration.nix b/modules/common/nixos_shell_configuration.nix deleted file mode 100644 index 1bec0145..00000000 --- a/modules/common/nixos_shell_configuration.nix +++ /dev/null @@ -1,66 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -{...}: { - soispha = { - networking = { - enable = true; - hostName = "lahmu"; - mode = "systemd-networkd"; - }; - - nixos-shell.enable = false; - - nixpkgs = { - enable = true; - systemName = "x86_64-linux"; - }; - - services = { - unison.enable = false; - backup = { - storagebox.enable = false; - local.enable = false; - }; - }; - - programs = { - river.enable = false; - - # We don't have access to the age secrets. - atuin.enableAge = false; - taskwarrior.enableAge = false; - }; - - locale = { - enable = true; - keyMap = "us"; - }; - - users = { - enable = true; - enableDeprecatedPlugdev = true; - - # Make logging in impossible. - # (This also removes root a obvious access-point from the virtual machine) - hashedPassword = ""; - }; - }; - - soispha = { - hardware = { - enable = false; - }; - - disks.enable = false; - }; - - # We run without state - # system.stateVersion = null; -} diff --git a/modules/common/projects.json b/modules/common/projects.json index 36a2ae45..ea14d6e4 100644 --- a/modules/common/projects.json +++ b/modules/common/projects.json @@ -1,7 +1,4 @@ { - "3d-printer": { - "prefix": "hardware" - }, "aoc": { "prefix": "programming/advent_of_code" }, @@ -15,19 +12,7 @@ "pc": {} } }, - "camera": { - "prefix": "programming/zig" - }, - "hardware": { - "prefix": "research" - }, - "input": { - "prefix": "research", - "subprojects": { - "dotfiles": {}, - "read-things": {} - } - }, + "esc": {}, "latex": { "prefix": "programming/latex" }, @@ -37,45 +22,10 @@ "google": {}, "health": {}, "job": {}, + "shop": {}, "sweden": {} } }, - "possible-projects": { - "prefix": "research" - }, - "presentation": { - "prefix": "research" - }, - "school": { - "prefix": "research", - "subprojects": { - "biologie": {}, - "chemie": { - "subprojects": { - "facharbeit": {} - } - }, - "deutsch": {}, - "english": {}, - "extern": { - "subprojects": { - "bwinf": {}, - "dsa": {} - } - }, - "geographie": {}, - "geschichte": {}, - "infomatik": {}, - "klausuren": {}, - "latein": {}, - "mathematik": {}, - "musik": {}, - "philosophie": {}, - "physik": {}, - "sozialkunde": {}, - "sport": {} - } - }, "server": { "prefix": "config", "subprojects": { @@ -87,15 +37,8 @@ "sudo-less": {} } }, - "serverphone": { - "prefix": "programming/rust" - }, "smartphone": { - "prefix": "hardware", - "subprojects": { - "airdrop": {}, - "airplay": {} - } + "prefix": "hardware" }, "system": { "prefix": "config", @@ -107,6 +50,7 @@ "gpg": {}, "keyboard": {}, "laptop": {}, + "music": {}, "nvim": {}, "rss": {}, "shell": {}, @@ -123,11 +67,5 @@ "youtube": {} } }, - "trinitrix": { - "prefix": "programming/rust", - "subprojects": { - "documentation": {}, - "testing": {} - } - } + "uni": {} } |
