diff --git a/flake.nix b/flake.nix index bf13e08..9755408 100755 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,7 @@ server = import ./home/server.nix flakeContext; }; homeModules = { + links = import ./home/modules/links.nix flakeContext; packages = import ./home/modules/packages.nix flakeContext; default = import ./home/modules/default.nix flakeContext; dconf = import ./home/modules/dconf.nix flakeContext; diff --git a/home/main.nix b/home/main.nix index 1b266c5..cb1ba8d 100755 --- a/home/main.nix +++ b/home/main.nix @@ -33,6 +33,10 @@ let source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/KeePassXC"; target = "keepassxc"; }; +# "beets" = { +# source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/beets/linux"; +# target = "beets"; +# }; }; userDirs = { enable = true; diff --git a/home/modules/links.nix b/home/modules/links.nix new file mode 100644 index 0000000..d7eb27c --- /dev/null +++ b/home/modules/links.nix @@ -0,0 +1,19 @@ +{ inputs, ... }@flakeContext: +{ + config, + lib, + pkgs, + ... +}: +{ + xdg = { + enable = true; + autostart.enable = true; + configFile = { + "beets" = { + source = config.lib.file.mkOutOfStoreSymlink "${inputs.zeroq.dirs.user-storage}/beets/linux"; + target = "beets"; + }; + }; + }; +} diff --git a/home/server.nix b/home/server.nix index 36df611..1482213 100755 --- a/home/server.nix +++ b/home/server.nix @@ -8,7 +8,7 @@ let ... }: { - imports = [ inputs.self.homeModules.default ]; + imports = [ inputs.self.homeModules.default inputs.self.homeModules.links ]; xdg = { enable = true; autostart.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 2ee55d0..f550c10 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,4 +13,26 @@ inputs.home-manager.nixosModules.home-manager # home-manager module inputs.nix-index-database.nixosModules.nix-index ]; + + # defines global user + users = { + users = { + "${inputs.zeroq.devices.admin}" = { + isNormalUser = true; + description = "Jor Oqyude"; + initialPassword = "1234"; + extraGroups = [ + "beets" + "audio" + "disk" + "gamemode" + "libvirtd" + "networkmanager" + "pipewire" + "qemu-libvirtd" + "wheel" + ]; + }; + }; + }; } diff --git a/modules/essentials/default.nix b/modules/essentials/default.nix index ca25976..519c375 100644 --- a/modules/essentials/default.nix +++ b/modules/essentials/default.nix @@ -9,27 +9,5 @@ ./services.nix ./settings.nix ./tty.nix - ./users.nix ]; - - users = { - users = { - "${inputs.zeroq.devices.admin}" = { - isNormalUser = true; - description = "Jor Oqyude"; - initialPassword = "1234"; - extraGroups = [ - "beets" - "audio" - "disk" - "gamemode" - "libvirtd" - "networkmanager" - "pipewire" - "qemu-libvirtd" - "wheel" - ]; - }; - }; - }; } diff --git a/modules/software/beets/default.nix b/modules/software/beets/default.nix index c0e4f7a..810aafd 100644 --- a/modules/software/beets/default.nix +++ b/modules/software/beets/default.nix @@ -41,23 +41,4 @@ in }; }; }; - - # users = { - # groups = { - # beets = { }; - # }; - # users = { - # beets = { - # isSystemUser = true; - # #isNormalUser = true; - # description = "beets service"; - # group = "beets"; - # homeMode = "0770"; - # home = "/var/lib/beets"; - # packages = [ ]; - # shell = pkgs.bashInteractive; - # }; - # }; - # }; - }