diff --git a/nix/.gitignore b/nix/.gitignore new file mode 100644 index 0000000..301d47e --- /dev/null +++ b/nix/.gitignore @@ -0,0 +1 @@ +flake.lock diff --git a/nix/base/common_hardware.nix b/nix/base/common_hardware.nix index e86ab4a..83b53a3 100644 --- a/nix/base/common_hardware.nix +++ b/nix/base/common_hardware.nix @@ -42,6 +42,10 @@ DIRENV_LOG_FORMAT = ""; }; + nix.settings.trusted-users = [ + "dashie" + ]; + # allows user change later on users.mutableUsers = true; users.users.dashie = { @@ -58,17 +62,5 @@ password = "firstlogin"; }; - nix.settings = { - builders-use-substitutes = true; - # substituters to use - substituters = [ - "https://anyrun.cachix.org" - ]; - - trusted-public-keys = [ - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - ]; - }; - system.stateVersion = "unstable"; } diff --git a/nix/flake.lock b/nix/flake.lock deleted file mode 100644 index e3500e7..0000000 --- a/nix/flake.lock +++ /dev/null @@ -1,516 +0,0 @@ -{ - "nodes": { - "Hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "hyprlandPlugins": "hyprlandPlugins", - "nixpkgs": [ - "Hyprspace", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713113295, - "narHash": "sha256-3oivuUgU2B3zQIuop1lc+VXBOhqCnZMl81pFYdZu1oc=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "046533d6fb0244874273254d4008cbdc48621829", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712136515, - "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", - "owner": "Kirottu", - "repo": "anyrun", - "rev": "be6728884d543665e7bd137bbef62dc1d04a210b", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "anyrun", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711681752, - "narHash": "sha256-LEg6/dmEFxx6Ygti5DO9MOhGNpyB7zdxdWtzv/FCTXk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "ada0fb4dcce4561acb1eb17c59b7306d9d4a95f3", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713077896, - "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1712434681, - "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1713126795, - "narHash": "sha256-IX9N+WMMcdBsxjQFLHjBCwXByMt+0S8sL18dQ2QTzvI=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "67f47fbdccd639502a76ccb3552a23df37f19ef8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "67f47fbdccd639502a76ccb3552a23df37f19ef8", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlandPlugins": { - "inputs": { - "hyprland": [ - "Hyprspace", - "hyprland" - ], - "systems": [ - "Hyprspace", - "hyprlandPlugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1712836056, - "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1711671891, - "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "c1402612146ba06606ebf64963a02bc1efe11e74", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "ironbar": { - "inputs": { - "crane": "crane", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1713218218, - "narHash": "sha256-f2GOHnoLe9PeVI0Itvm0RVPxc102ZdHabNDYUxoL/RY=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "3fea6e3254a8cda16b32443d1f8f3282218b07c5", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1698420672, - "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", - "owner": "nix-community", - "repo": "naersk", - "rev": "aeb58d5e8faead8980a807c840232697982d47b9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "nix-flatpak": { - "locked": { - "lastModified": 1711997375, - "narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "45bf66f7068db79b552da864c0e87452be624d6c", - "type": "github" - }, - "original": { - "owner": "gmodena", - "repo": "nix-flatpak", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714642414, - "narHash": "sha256-Fs83qDWunAxlTbEiC9YbCzpMvxS8wZmPJ18W28Zgl/8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "121251b7c5567bc118d6af2ec8c464a951792b45", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "Hyprspace": "Hyprspace", - "anyrun": "anyrun", - "home-manager": "home-manager", - "hyprland": "hyprland", - "ironbar": "ironbar", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "ironbar", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711851236, - "narHash": "sha256-EJ03x3N9ihhonAttkaCrqxb0djDq3URCuDpmVPbNZhA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f258266af947599e8069df1c2e933189270f143a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714702555, - "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", - "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/flake.nix b/nix/flake.nix index 20e1b37..8aade6c 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -3,31 +3,31 @@ inputs = { - nix-flatpak.url = "github:gmodena/nix-flatpak"; - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable"; + nix-flatpak = { + url = "github:gmodena/nix-flatpak"; + #inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland/67f47fbdccd639502a76ccb3552a23df37f19ef8"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # inputs.nixpkgs.follows = "nixpkgs"; Hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; }; ironbar = { url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; rust-overlay = { url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; - anyrun.url = "github:Kirottu/anyrun"; - anyrun.inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { ... }@inputs: @@ -81,4 +81,18 @@ ] ++ base_imports; }; }; + + nixConfig = { + builders-use-substitutes = true; + # substituters to use + extra-substituters = [ + "https://hyprland.cachix.org" + "https://anyrun.cachix.org" + ]; + + extra-trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + ]; + }; } diff --git a/nix/override/streamdeck.nix b/nix/override/streamdeck.nix index 47ed30d..705155f 100644 --- a/nix/override/streamdeck.nix +++ b/nix/override/streamdeck.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { patches = [ # nixpkgs has a newer pillow version - ./streamdeck_path.patch + ./streamdeck.patch ]; desktopItems = diff --git a/nix/override/streamdeck_path.patch b/nix/override/streamdeck.patch similarity index 60% rename from nix/override/streamdeck_path.patch rename to nix/override/streamdeck.patch index 30cd277..3c8cf05 100644 --- a/nix/override/streamdeck_path.patch +++ b/nix/override/streamdeck.patch @@ -1,8 +1,13 @@ diff --git a/pyproject.toml b/pyproject.toml -index 54a8c19..f107170 100644 +index 54a8c19..0b95fb3 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -18,7 +18,7 @@ pillow = "10.2.0" +@@ -14,11 +14,11 @@ packages = [ + [tool.poetry.dependencies] + python = ">=3.8,<3.13" + streamdeck = "^0.9.5" +-pillow = "10.2.0" ++pillow = "^10.2.0" pyside6 = "^6.4.2" CairoSVG = "^2.5.2" filetype = "^1.0.10" diff --git a/nix/programs/flatpak.nix b/nix/programs/flatpak.nix index c61d994..1e1551b 100644 --- a/nix/programs/flatpak.nix +++ b/nix/programs/flatpak.nix @@ -12,6 +12,7 @@ "org.onlyoffice.desktopeditors" "org.gtk.Gtk3theme.adw-gtk3" "com.brave.Browser" + "com.rustdesk.RustDesk" ]; } diff --git a/nix/programs/utils.nix b/nix/programs/utils.nix index 4a95190..e2ef138 100644 --- a/nix/programs/utils.nix +++ b/nix/programs/utils.nix @@ -3,7 +3,6 @@ }: { home.packages = with pkgs; [ - rustdesk keepassxc nheko kdeconnect