diff --git a/containers/lidarr.nix b/containers/lidarr.nix index a886f5f..c4bd004 100644 --- a/containers/lidarr.nix +++ b/containers/lidarr.nix @@ -5,7 +5,7 @@ }: { options.settings.containers.lidarr = { - enable = lib.mkEnableOption "enable lidarr container"; + enable = lib.mkEnableOption "enable lidarr arion container"; }; config = lib.mkIf config.settings.containers.lidarr.enable { @@ -33,5 +33,34 @@ services.lidarr.openFirewall = true; }; }; + + # virtualisation.arion.projects.lidarr = { + # settings = { + # project.name = "lidarr"; + # services.lidarr = { + # service.useHostStore = true; + # nixos.useSystemd = true; + # nixos.configuration = + # { lib, ... }: + # { + # boot.isContainer = true; + # boot.tmp.useTmpfs = true; + # networking.useDHCP = false; + # services.nscd.enable = false; + # system.nssModules = lib.mkForce [ ]; + + # services.lidarr.enable = true; + # services.lidarr.openFirewall = true; + # services.lidarr.dataDir = "/config"; + # services.lidarr.user = "root"; + # }; + # service.ports = [ "8686:8686" ]; + # service.volumes = [ + # "/config/lidarr:/config" + # "/data:/data" + # ]; + # }; + # }; + # }; }; } diff --git a/containers/qbittorrent.nix b/containers/qbittorrent.nix index 0934e1a..fe9eb97 100644 --- a/containers/qbittorrent.nix +++ b/containers/qbittorrent.nix @@ -23,13 +23,11 @@ ]; service.volumes = [ "/config/qbittorrent:/config" - "/data/torrents:/data/torrents" + "/data/torrents:/torrents" ]; service.environment = { WEBUI_PORT = 8080; TORRENTING_PORT = 6881; - PUID = 0; - PGID = 0; }; }; }; diff --git a/flake.lock b/flake.lock index cb7cdcf..9f386f0 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1767581175, - "narHash": "sha256-d9ztdDD4EIbsGbERzXhg6Vlo7zMChjpZci4IrS0hSAY=", + "lastModified": 1759632323, + "narHash": "sha256-TzLTfXxhOkR/8oOoVEAYQWb81ADGHdKsQXGicC7kR+M=", "owner": "hercules-ci", "repo": "arion", - "rev": "3534dd9d0f32c7dbee4f87378d4c95ffcd8838c5", + "rev": "24658a03be2d1a6e1e02c01524775d960a82309c", "type": "github" }, "original": { @@ -43,28 +43,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", "type": "gitlab" }, "original": { @@ -207,11 +207,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767943678, - "narHash": "sha256-tg16bbDEkv1rJWe8v1n1CJFi2Fgxuee6b3c4KbLivY4=", + "lastModified": 1762973522, + "narHash": "sha256-CFyvvZvKDkTFF7niIQp5hhks5OR1u10H3e89chURCkg=", "owner": "helix-editor", "repo": "helix", - "rev": "10f07d7eb089430930e6d3547a98b440b927d025", + "rev": "948ac05aa0db64e0e5d00710db36eb244076e988", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1768065415, - "narHash": "sha256-GFwoRFzCP5vpT/tdO/Y6/799gb9OIAV9cOBPVM0Kq54=", + "lastModified": 1763228015, + "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0aefc169fa9a0bd2b1239aeb98899c77d6da5b2", + "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39", "type": "github" }, "original": { @@ -252,11 +252,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768056313, - "narHash": "sha256-2jx5DeIZ4jsOtBGZEopeY3nqbDhnSyBVy6BKV5YO7yE=", + "lastModified": 1763286362, + "narHash": "sha256-KPQWFSoObIndZ2jGShk2KL9lEwIMysLwBsHJpiJz55w=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "07882a2c8130ce0addb6c1388f907780855e8eac", + "rev": "024550217d69bb1afaf3ae8d808ce767cda1f15f", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768049147, - "narHash": "sha256-ZR4bY+cF1Nm0PJx0xJWwl5Pf9ku8baUgvbD+d2Q3X1w=", + "lastModified": 1763280630, + "narHash": "sha256-2nCZp70LNGzfrx9J8D5G9uRHo8YufQ1tVVdbzRbhCIc=", "owner": "YaLTeR", "repo": "niri", - "rev": "45fc76328145e0bf91b13edb7a43ac1f5770cb48", + "rev": "2652efe9dbee60b9172adda37a17c59b069288cb", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1768025207, - "narHash": "sha256-+32x+zJ1ys2VJ1SUiwnImgsaHZdlPCMdlzz09kt5v9I=", + "lastModified": 1763258556, + "narHash": "sha256-TWgLZJWn0aBAzu8By3y+OUoFsfOvy1AmIduR5G6QpSE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6ec1985c13c5ea9ee5ae0a4971df04ac798682e0", + "rev": "2ad9c9778431846e4d506ced079b638ad4e25806", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -336,16 +336,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767903301, - "narHash": "sha256-h7HUP2xjbwjXb+DvAxIH6R9G1RdGCAQao8zCw3jj+yY=", + "lastModified": 1763245881, + "narHash": "sha256-0q+4x1Gx3AMIRV8MIN2/WOJOAVMtfqnkY1m3k0iIDkI=", "owner": "danth", "repo": "stylix", - "rev": "2b727da436910c4a59b5fd2401609bd5cb7ec64a", + "rev": "29dc3dd858c507bfd1038716197f84f40e41f28d", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -509,11 +509,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -525,11 +525,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1768031762, - "narHash": "sha256-b2gJDJfi+TbA7Hu2sKip+1mWqya0GJaWrrXQjpbOVTU=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0c445aa21b01fd1d4bb58927f7b268568af87b20", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1767932953, - "narHash": "sha256-V8+DrPOp940J6icERAaGuDQTKyEyZzFuRw363XwDKXg=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "bc47ef59501556fc2584155ddef76493752dd727", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { diff --git a/hosts/main-homelab/configuration.nix b/hosts/main-homelab/configuration.nix index 529202b..2c8c546 100644 --- a/hosts/main-homelab/configuration.nix +++ b/hosts/main-homelab/configuration.nix @@ -62,12 +62,6 @@ users.extraUsers.veneficium.extraGroups = [ "podman" ]; - xdg.autostart.enable = false; - xdg.icons.enable = false; - xdg.menus.enable = false; - xdg.mime.enable = false; - xdg.sounds.enable = false; - environment.systemPackages = with pkgs; [ nano lshw diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix index 31ba2b2..5a955e9 100644 --- a/hosts/main-laptop/configuration.nix +++ b/hosts/main-laptop/configuration.nix @@ -75,7 +75,7 @@ drivers = { printer.M2020.enable = lib.mkForce true; ipod.enable = lib.mkForce true; - openrazer.enable = lib.mkForce false; + openrazer.enable = lib.mkForce true; gpu.amd.enable = lib.mkForce true; }; diff --git a/modules/home/niri/niri.nix b/modules/home/niri/niri.nix index 0d5a170..0235b1f 100644 --- a/modules/home/niri/niri.nix +++ b/modules/home/niri/niri.nix @@ -17,10 +17,10 @@ programs.quickshell = { enable = true; - # configs = { - # "default" = ./shell.qml; - # }; - # activeConfig = "default"; + configs = { + "default" = ./shell.qml; + }; + activeConfig = "default"; }; services.mako = { diff --git a/modules/home/quickshell/shell.qml b/modules/home/niri/shell.qml similarity index 88% rename from modules/home/quickshell/shell.qml rename to modules/home/niri/shell.qml index 9c0b8dd..4171e28 100644 --- a/modules/home/quickshell/shell.qml +++ b/modules/home/niri/shell.qml @@ -1,4 +1,3 @@ -//@ pragma UseQApplication import Quickshell import QtQuick import QtQuick.Layouts @@ -56,24 +55,12 @@ PanelWindow { id: hover_handler } - PopupWindow { - id: menu_parent - anchor.item: tray_item - anchor.rect.y: tray_item.height - anchor.rect.x: tray_item.width - visible: true - implicitWidth: 1 - implicitHeight: 1 - color: "transparent" - } - TapHandler { - acceptedButtons: Qt.LeftButton | Qt.RightButton onTapped: (eventPoint, button) => { if (button == 1) { tray_item.modelData.activate(); } else { - tray_item.modelData.display(menu_parent, 0, 0); + tray_item.modelData.display(label, 0, 0); } } } diff --git a/modules/home/quickshell/quickshell.nix b/modules/home/quickshell/quickshell.nix deleted file mode 100644 index 61a825c..0000000 --- a/modules/home/quickshell/quickshell.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - programs.quickshell = { - enable = true; - configs = { - "default" = ./shell.qml; - }; - activeConfig = "default"; - }; -} diff --git a/modules/nixos/programs/niri.nix b/modules/nixos/programs/niri.nix index 4363a8e..8c9c793 100644 --- a/modules/nixos/programs/niri.nix +++ b/modules/nixos/programs/niri.nix @@ -16,42 +16,6 @@ gtk.iconCache.enable = true; - xdg.portal = { - enable = true; - xdgOpenUsePortal = true; - wlr.enable = true; - config = { - common = { - default = [ - "gtk" - "wlr" - ]; - }; - niri = { - default = [ - "gtk" - "wlr" - ]; - }; - }; - }; - xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-wlr - pkgs.xdg-desktop-portal-gtk - ]; - systemd.user.services.xdg-desktop-portal = { - after = [ "xdg-desktop-autostart.target" ]; - }; - systemd.user.services.xdg-desktop-portal-gtk = { - after = [ "xdg-desktop-autostart.target" ]; - }; - systemd.user.services.xdg-desktop-portal-gnome = { - after = [ "xdg-desktop-autostart.target" ]; - }; - systemd.user.services.niri-flake-polkit = { - after = [ "xdg-desktop-autostart.target" ]; - }; - environment.systemPackages = with pkgs; [ swayosd wl-clipboard diff --git a/todo b/todo deleted file mode 100644 index f10ad06..0000000 --- a/todo +++ /dev/null @@ -1,12 +0,0 @@ -- setup secrets management - -laptop -- switch to ly -- config firefox -- finish quickshell -- finish packaging gbdk - -server -- setup disko -- setup impermenance -- move to nixos containters