diff --git a/flake.lock b/flake.lock index d3ae858..cf02733 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1697555443, - "narHash": "sha256-nsq8A+adEdN7bvVdz09LFyrHkTW5GtOzo/ctlHhyaaE=", + "lastModified": 1697622055, + "narHash": "sha256-t9rwzjlfgCnXDFGH3wsooYfAOA+XqQmgTojhzuNafZ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3acf1dc78b38a2fe03b287fead44d7ad25ac7c5", + "rev": "84fa81c7acb018c3c5a504dcefbc28a182c933c2", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1697534983, - "narHash": "sha256-BRFBhLehpdoxtaRpPUzwSpZuVMjcmbhozhMNbeoDslk=", + "lastModified": 1697646003, + "narHash": "sha256-RNg0aTTxpEH+tO5Cxj3DuihfiZBo8veZAttCW1FscO4=", "owner": "nix-community", "repo": "nixvim", - "rev": "465d09849a600f90e55f8a0f898fd11c2e292207", + "rev": "d560fc6183b4c6bf68f0846e6b1ef906f2c78929", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index ea33e5d..31f7e55 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,8 +6,16 @@ useGlobalPkgs = true; }; home-manager.users.artemis = { - imports = - [ ./fish.nix ./gtk.nix ./git.nix ./mpv.nix ./kitty.nix ./ssh ./gpg.nix ]; + imports = [ + ./fish.nix + ./gtk.nix + ./git.nix + ./mpv.nix + ./kitty.nix + ./ssh + ./gpg.nix + ./dirs.nix + ]; home.stateVersion = config.system.stateVersion; diff --git a/home/dirs.nix b/home/dirs.nix new file mode 100644 index 0000000..9cf60ed --- /dev/null +++ b/home/dirs.nix @@ -0,0 +1,10 @@ +{ config, lib, ... }: + +{ + xdg.userDirs = with lib; { + enable = true; + documents = mkDefault "${config.home.homeDirectory}/Dokumente"; + music = mkDefault "${config.home.homeDirectory}/Musik"; + pictures = mkDefault "${config.home.homeDirectory}/Bilder"; + }; +} diff --git a/system/spike/default.nix b/system/spike/default.nix index 495103e..90a6110 100644 --- a/system/spike/default.nix +++ b/system/spike/default.nix @@ -17,29 +17,32 @@ networking.hostName = "spike"; system.stateVersion = "23.11"; - home-manager.users.artemis.xdg.configFile."rustybar/config.toml".text = '' - [[tile]] - type = "load" - [[tile]] - type = "memory" - [[tile]] - type = "hostname" - [[tile]] - type = "battery" - [[tile]] - type = "time" - format = "%Y-%m-%dT%H:%M:%S" - ''; + home-manager.users.artemis = { + xdg.configFile."rustybar/config.toml".text = '' + [[tile]] + type = "load" + [[tile]] + type = "memory" + [[tile]] + type = "hostname" + [[tile]] + type = "battery" + [[tile]] + type = "time" + format = "%Y-%m-%dT%H:%M:%S" + ''; - home-manager.users.artemis.wayland.windowManager.sway.config = { - output."DSI-1" = { - pos = "0 0"; - mode = "720x1280@60.083Hz"; - transform = "90"; - }; - input."24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" = { - scroll_method = "on_button_down"; - scroll_button = "BTN_MIDDLE"; + wayland.windowManager.sway.config = { + output."DSI-1" = { + pos = "0 0"; + mode = "720x1280@60.083Hz"; + transform = "90"; + }; + input."24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" = { + scroll_method = "on_button_down"; + scroll_button = "BTN_MIDDLE"; + }; }; + xdg.userDirs.music = "/media/µsd/Musik"; }; } diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 9b43382..10c992c 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -135,6 +135,10 @@ type = "time" format = "%Y-%m-%dT%H:%M:%S" ''; + xdg.userDirs = { + music = "/media/data/Musik"; + pictures = "/media/luna/photos"; + }; }; # NixOS system.stateVersion = "21.11";