diff --git a/common/home/bash/programs.nix b/common/home/bash/programs.nix index 3d3af5e..e00fcc9 100644 --- a/common/home/bash/programs.nix +++ b/common/home/bash/programs.nix @@ -41,7 +41,7 @@ themes = { dracula-bat = { src = pkgs.dracula-theme; - file = "bat/Dracula.tmTheme"; + file = "bat"; }; }; extraPackages = with pkgs.bat-extras; [ diff --git a/common/home/trash-d/default.nix b/common/home/trash-d/default.nix index ecbba28..5a86745 100644 --- a/common/home/trash-d/default.nix +++ b/common/home/trash-d/default.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: let - trash = pkgs.callPackage ./trash-d.nix pkgs; +{pkgs, ...} @ inputs: let + trash = pkgs.callPackage ./trash-d.nix inputs; in { home.packages = [trash]; diff --git a/common/home/trash-d/trash-d.nix b/common/home/trash-d/trash-d.nix index ac066a9..9062e73 100644 --- a/common/home/trash-d/trash-d.nix +++ b/common/home/trash-d/trash-d.nix @@ -1,6 +1,6 @@ { + trash-d-src, stdenv, - fetchFromGitHub, dmd, dub, ronn, @@ -8,14 +8,9 @@ }: stdenv.mkDerivation { name = "trash"; - version = "unstable"; + version = trash-d-src.rev; - src = fetchFromGitHub { - owner = "rushsteve1"; - repo = "trash-d"; - rev = "d88bb672612761c8e299e717857bf9c85a903e99"; - hash = "sha256-oPxeoEqOYf6DCg5rJxINqAIlMbxqzAJcZDUY/EzADzY="; - }; + src = trash-d-src; buildInputs = [dub dmd ronn]; diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 3b894ca..abab5eb 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -2,11 +2,11 @@ neovim-flake, nixpkgs-wayland, ... -}: { +} @ inputs: { nixpkgs.overlays = [ - (import ./dracula-theme) - (import ./plymouth) - (import ./spotifywm) + (import ./dracula-theme inputs) + (import ./plymouth inputs) + (import ./spotifywm inputs) (import ./squeekboard) neovim-flake.overlay diff --git a/common/overlays/dracula-theme/bat.nix b/common/overlays/dracula-theme/bat.nix deleted file mode 100644 index 5e9a9d9..0000000 --- a/common/overlays/dracula-theme/bat.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - ... -}: -stdenv.mkDerivation { - name = "dracula-bat"; - - src = fetchFromGitHub { - owner = "matt1432"; - repo = "bat"; - rev = "270bce892537311ac92494a2a7663e3ecf772092"; - hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw="; - }; - - installPhase = '' - mkdir -p $out/bat - cp -a ./Dracula.tmTheme $out/bat - ''; -} diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix index 735eb98..422d08a 100644 --- a/common/overlays/dracula-theme/default.nix +++ b/common/overlays/dracula-theme/default.nix @@ -1,17 +1,14 @@ -(final: prev: { +{ + bat-theme-src, + xresources-theme-src, + ... +} @ inputs: (final: prev: { dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let - bat-colors = prev.callPackage ./bat.nix prev; - git-colors = prev.callPackage ./git.nix prev; - plymouth = prev.callPackage ./plymouth.nix prev; - Xresources = prev.callPackage ./xresources.nix prev; + git-colors = prev.callPackage ./git.nix inputs; + plymouth = prev.callPackage ./plymouth.nix inputs; wallpaper = prev.fetchurl (import ./wallpaper.nix); in { - src = prev.fetchFromGitHub { - owner = "dracula"; - repo = "gtk"; - rev = "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc"; - hash = "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA="; - }; + src = inputs.gtk-theme-src; installPhase = '' runHook preInstall @@ -19,10 +16,10 @@ mkdir -p $out/share/plymouth/themes $out/wallpapers cp -a ${wallpaper} $out/wallpapers/waves.png - cp -a ${bat-colors}/bat $out/bat + cp -a ${bat-theme-src}/Dracula.tmTheme $out/bat cp -a ${git-colors}/git-colors $out/git-colors cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/ - cp -a ${Xresources}/xres $out/xres + cp -a ${xresources-theme-src}/Xresources $out/xres # ------------------------------------------- mkdir -p $out/share/themes/Dracula diff --git a/common/overlays/dracula-theme/git.nix b/common/overlays/dracula-theme/git.nix index 8b904f4..f13840d 100644 --- a/common/overlays/dracula-theme/git.nix +++ b/common/overlays/dracula-theme/git.nix @@ -1,17 +1,13 @@ { stdenv, - fetchFromGitHub, + git-theme-src, ... }: stdenv.mkDerivation { name = "dracula-git"; + version = git-theme-src.rev; - src = fetchFromGitHub { - owner = "dracula"; - repo = "git"; - rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73"; - hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM="; - }; + src = git-theme-src; installPhase = '' # Git colors diff --git a/common/overlays/dracula-theme/plymouth.nix b/common/overlays/dracula-theme/plymouth.nix index f43d43f..78d2f28 100644 --- a/common/overlays/dracula-theme/plymouth.nix +++ b/common/overlays/dracula-theme/plymouth.nix @@ -1,17 +1,13 @@ { stdenv, - fetchFromGitHub, + plymouth-theme-src, ... }: stdenv.mkDerivation { name = "dracula-plymouth"; + version = plymouth-theme-src.rev; - src = fetchFromGitHub { - owner = "dracula"; - repo = "plymouth"; - rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96"; - hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA="; - }; + src = plymouth-theme-src; installPhase = let dracula-script = ./dracula-plymouth.patch; diff --git a/common/overlays/dracula-theme/wallpaper.nix b/common/overlays/dracula-theme/wallpaper.nix index 95cde49..c1ae71e 100644 --- a/common/overlays/dracula-theme/wallpaper.nix +++ b/common/overlays/dracula-theme/wallpaper.nix @@ -1,4 +1,4 @@ { - url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true"; + url = "https://raw.githubusercontent.com/aynp/dracula-wallpapers/main/Art/4k/Waves%201.png"; hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk="; } diff --git a/common/overlays/dracula-theme/xresources.nix b/common/overlays/dracula-theme/xresources.nix deleted file mode 100644 index 866cf5d..0000000 --- a/common/overlays/dracula-theme/xresources.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - ... -}: -stdenv.mkDerivation { - name = "dracula-xresources"; - - src = fetchFromGitHub { - owner = "dracula"; - repo = "xresources"; - rev = "539ef24e9b0c5498a82d59bfa2bad9b618d832a3"; - hash = "sha256-6fltsAluqOqYIh2NX0I/LC3WCWkb9Fn8PH6LNLBQbrY="; - }; - - installPhase = '' - mkdir -p $out/xres - cp -a ./Xresources $out/xres/ - ''; -} diff --git a/common/overlays/plymouth/default.nix b/common/overlays/plymouth/default.nix index 1c9edce..0e4eb85 100644 --- a/common/overlays/plymouth/default.nix +++ b/common/overlays/plymouth/default.nix @@ -1,16 +1,6 @@ -final: prev: { +{plymouth-src, ...}: (final: prev: { plymouth = prev.plymouth.overrideAttrs (o: { - version = "unstable-2023-12-08"; - - src = prev.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "plymouth"; - repo = "plymouth"; - - # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236 - # Last commit that works - rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be"; - hash = "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE="; - }; + version = plymouth-src.rev; + src = plymouth-src; }); -} +}) diff --git a/common/overlays/spotifywm/default.nix b/common/overlays/spotifywm/default.nix index 32e874c..14cb47a 100644 --- a/common/overlays/spotifywm/default.nix +++ b/common/overlays/spotifywm/default.nix @@ -1,3 +1,3 @@ -(final: prev: { - spotifywm = final.callPackage ./spotifywm.nix {}; +{...} @ inputs: (final: prev: { + spotifywm = final.callPackage ./spotifywm.nix inputs; }) diff --git a/common/overlays/spotifywm/spotifywm.nix b/common/overlays/spotifywm/spotifywm.nix index aa65898..bfeb832 100644 --- a/common/overlays/spotifywm/spotifywm.nix +++ b/common/overlays/spotifywm/spotifywm.nix @@ -2,26 +2,20 @@ { lib, stdenv, - fetchFromGitHub, + spotifywm-src, libX11, makeBinaryWrapper, spotify, symlinkJoin, + ... }: let spotifywm = stdenv.mkDerivation { pname = "spotifywm"; - version = "unstable-2022-10-25"; + version = spotifywm-src.rev; - src = fetchFromGitHub { - owner = "dasJ"; - repo = "spotifywm"; - rev = "8624f539549973c124ed18753881045968881745"; - hash = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0="; - }; + src = spotifywm-src; - buildInputs = [ - libX11 - ]; + buildInputs = [libX11]; installPhase = '' runHook preInstall @@ -35,9 +29,7 @@ in symlinkJoin { inherit (spotifywm) name; - nativeBuildInputs = [ - makeBinaryWrapper - ]; + nativeBuildInputs = [makeBinaryWrapper]; paths = [ spotify diff --git a/common/pkgs/coloryou/default.nix b/common/pkgs/coloryou/default.nix index d4bd171..537936f 100644 --- a/common/pkgs/coloryou/default.nix +++ b/common/pkgs/coloryou/default.nix @@ -1,4 +1,4 @@ -{python3Packages}: +{python3Packages, ...}: python3Packages.buildPythonPackage { pname = "coloryou"; version = "0.0.1"; diff --git a/common/pkgs/coloryou/shell.nix b/common/pkgs/coloryou/shell.nix index 761114d..5ac2d6d 100644 --- a/common/pkgs/coloryou/shell.nix +++ b/common/pkgs/coloryou/shell.nix @@ -1,6 +1,6 @@ with import {}; with pkgs.python311Packages; - buildPythonPackage rec { + buildPythonPackage { name = "coloryou"; src = ./.; propagatedBuildInputs = [material-color-utilities utils]; diff --git a/common/pkgs/default.nix b/common/pkgs/default.nix index d4b18c9..d17acb4 100644 --- a/common/pkgs/default.nix +++ b/common/pkgs/default.nix @@ -2,10 +2,10 @@ lib, pkgs, ... -}: +} @ inputs: with lib; let mkPackage = name: v: { - ${name} = pkgs.callPackage ./${name} {}; + ${name} = pkgs.callPackage ./${name} inputs; }; rmNotPackage = name: value: diff --git a/common/pkgs/input-emulator/default.nix b/common/pkgs/input-emulator/default.nix deleted file mode 100644 index 5d71383..0000000 --- a/common/pkgs/input-emulator/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - stdenv, - meson, - ninja, - pkg-config, - cmake, - bash-completion, - fetchFromGitHub, -}: -stdenv.mkDerivation rec { - pname = "input-emulator"; - - src = fetchFromGitHub { - owner = "tio"; - repo = pname; - rev = "6c35040e6fc4f65ce0519ee76d00d60490bcb987"; - hash = "sha256-Im0RADqRwlZ/RiZFSVp+HwnWoLdcpRp0Ej6RP0GY0+c="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - cmake - bash-completion - ]; -} diff --git a/common/pkgs/pam-fprint-grosshack/default.nix b/common/pkgs/pam-fprint-grosshack/default.nix index e8252bd..362542d 100644 --- a/common/pkgs/pam-fprint-grosshack/default.nix +++ b/common/pkgs/pam-fprint-grosshack/default.nix @@ -10,17 +10,14 @@ systemd, pam, libpam-wrapper, - fetchFromGitLab, + pam-fprint-grosshack-src, + ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pam-fprint-grosshack"; + version = pam-fprint-grosshack-src.rev; - src = fetchFromGitLab { - owner = "mishakmak"; - repo = name; - rev = "45b42524fb5783e1e555067743d7e0f70d27888a"; - hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0="; - }; + src = pam-fprint-grosshack-src; nativeBuildInputs = [ meson diff --git a/common/pkgs/pokemon-colorscripts/default.nix b/common/pkgs/pokemon-colorscripts/default.nix index ad97967..464fd54 100644 --- a/common/pkgs/pokemon-colorscripts/default.nix +++ b/common/pkgs/pokemon-colorscripts/default.nix @@ -1,22 +1,19 @@ { stdenv, python3Packages, - fetchFromGitLab, + pokemon-colorscripts-src, + ... }: stdenv.mkDerivation { name = "pokemon-colorscripts"; + version = pokemon-colorscripts-src.rev; + + src = pokemon-colorscripts-src; propagatedBuildInputs = with python3Packages; [ python ]; - src = fetchFromGitLab { - owner = "phoneybadger"; - repo = "pokemon-colorscripts"; - rev = "0483c85b93362637bdd0632056ff986c07f30868"; - hash = "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A="; - }; - installPhase = '' mkdir -p $out/pokemon-colorscripts $out/bin diff --git a/common/pkgs/repl/default.nix b/common/pkgs/repl/default.nix index 1d3f472..38c3b90 100644 --- a/common/pkgs/repl/default.nix +++ b/common/pkgs/repl/default.nix @@ -3,6 +3,7 @@ coreutils, gnused, writeShellScriptBin, + ... }: let repl = ./repl.nix; example = command: desc: ''\n\u001b[33m ${command}\u001b[0m - ${desc}''; diff --git a/devices/binto/modules/gpu-replay.nix b/devices/binto/modules/gpu-replay.nix index 8691a17..423def9 100644 --- a/devices/binto/modules/gpu-replay.nix +++ b/devices/binto/modules/gpu-replay.nix @@ -2,13 +2,13 @@ pkgs, config, lib, + gpu-screen-recorder-src, ... }: let gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: { - src = pkgs.fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r445.84f9a04.tar.gz"; - hash = "sha256-YKGLv7QFBxTZDW9HKS6tEeP1pX91idtuy0oUr4mbjjU="; - }; + version = gpu-screen-recorder-src.rev; + + src = gpu-screen-recorder-src; postPatch = ""; diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix index e5f4c97..1c9f3ef 100644 --- a/devices/binto/modules/nix-gaming.nix +++ b/devices/binto/modules/nix-gaming.nix @@ -3,9 +3,7 @@ pkgs, ... }: { - imports = [ - nix-gaming.nixosModules.steamCompat - ]; + imports = [nix-gaming.nixosModules.steamCompat]; programs = { steam = { diff --git a/flake.lock b/flake.lock index af1de56..3bd63c9 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,22 @@ "type": "github" } }, + "bat-theme-src": { + "flake": false, + "locked": { + "lastModified": 1697829826, + "narHash": "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=", + "owner": "matt1432", + "repo": "bat", + "rev": "270bce892537311ac92494a2a7663e3ecf772092", + "type": "github" + }, + "original": { + "owner": "matt1432", + "repo": "bat", + "type": "github" + } + }, "caddy-plugins": { "inputs": { "nixpkgs": [ @@ -264,6 +280,54 @@ "type": "github" } }, + "git-theme-src": { + "flake": false, + "locked": { + "lastModified": 1672784534, + "narHash": "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=", + "owner": "dracula", + "repo": "git", + "rev": "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73", + "type": "github" + }, + "original": { + "owner": "dracula", + "repo": "git", + "type": "github" + } + }, + "gpu-screen-recorder-src": { + "flake": false, + "locked": { + "lastModified": 1704038996, + "narHash": "sha256-u1xBU0eq1BbWAKS3p0UH+BKlxOmM6pcKXHwTrjaBMKE=", + "ref": "refs/heads/master", + "rev": "275d4d1b3277b69dbb2942645cda1b92e31ead76", + "revCount": 450, + "type": "git", + "url": "https://repo.dec05eba.com/gpu-screen-recorder" + }, + "original": { + "type": "git", + "url": "https://repo.dec05eba.com/gpu-screen-recorder" + } + }, + "gtk-theme-src": { + "flake": false, + "locked": { + "lastModified": 1702763567, + "narHash": "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA=", + "owner": "dracula", + "repo": "gtk", + "rev": "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc", + "type": "github" + }, + "original": { + "owner": "dracula", + "repo": "gtk", + "type": "github" + } + }, "headscale": { "inputs": { "flake-utils": "flake-utils_2", @@ -314,11 +378,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1703995158, + "narHash": "sha256-oYMwbObpWheGeeNWY1LjO/+omrbAWDNdyzNDxTr2jo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "2e8634c252890cb38c60ab996af04926537cbc27", "type": "github" }, "original": { @@ -358,11 +422,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1703951941, - "narHash": "sha256-OWWeq3/ENX2Bo3F/OkhG3HFcgcdqJnsapjA3tD7B+fk=", + "lastModified": 1704027264, + "narHash": "sha256-RzzCNXrSjQAIB4C84/WZ5eYna20d2ZBKhE/PtWK89SM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "94d6b2d2c12663efe90f6d0410528b0d7bcc671e", + "rev": "46997a764304366d772456c20b1c719960927aa7", "type": "github" }, "original": { @@ -402,11 +466,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1703419730, - "narHash": "sha256-ZRqj/irxTzRoGne2eWmuNaSO1/rz22S1EGj+MJXINeo=", + "lastModified": 1704024543, + "narHash": "sha256-hmKcKSuTqVK47l2G0PkLAinZN1oCOb6XdPPJhNCQ2rg=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7deb8249793fd2e9244c4e652c18d95351eb1111", + "rev": "4608880f02f8f868e1b7f85c60abdfc5cb0cf9ec", "type": "github" }, "original": { @@ -682,11 +746,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1703378839, - "narHash": "sha256-wJDrJji9XNMgAsO+Ah34BaraG8bAw9GF7poJQPE0TqU=", + "lastModified": 1703983607, + "narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9b3a550ca7d42f5ceb3acc13f95dae1a69e6de56", + "rev": "a6c99b57d2e58f7fc6d52a08b0ba40160e75f738", "type": "github" }, "original": { @@ -719,11 +783,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1703989714, - "narHash": "sha256-CnFwl02DcUj4J9BVd8RCg0LzBy0OaRS/sN75JNADwYM=", + "lastModified": 1704046694, + "narHash": "sha256-8mDyaw+n1gVAzT5O2F/qZCp+i7O8gzDoDHcvv/dIwZU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d1d5860ae4ff1283f4bca0d7319da06dac54472a", + "rev": "39a5058639690de025b5d71c366d7e422763dde7", "type": "github" }, "original": { @@ -898,11 +962,11 @@ }, "nur": { "locked": { - "lastModified": 1703994130, - "narHash": "sha256-yuTGcrmNVHc9f9u6nlYqX4td2TIiLaXei3hIwEqq5tw=", + "lastModified": 1704050432, + "narHash": "sha256-gPHL0esqZX1ziS2DZpG42vp+/os7kliqNDbmBVRY6l0=", "owner": "nix-community", "repo": "NUR", - "rev": "796747b378e54debbca6324327ca33b886f54612", + "rev": "e3a2c227b7de1a72acd98028d8c0cb6f3e2cec60", "type": "github" }, "original": { @@ -929,11 +993,82 @@ "type": "github" } }, + "pam-fprint-grosshack-src": { + "flake": false, + "locked": { + "lastModified": 1658952526, + "narHash": "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=", + "owner": "mishakmak", + "repo": "pam-fprint-grosshack", + "rev": "45b42524fb5783e1e555067743d7e0f70d27888a", + "type": "gitlab" + }, + "original": { + "owner": "mishakmak", + "repo": "pam-fprint-grosshack", + "type": "gitlab" + } + }, + "plymouth-src": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1702057553, + "narHash": "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE=", + "owner": "plymouth", + "repo": "plymouth", + "rev": "58cc9f84e456ab0510b13d7bdbc13697467ca7be", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "plymouth", + "repo": "plymouth", + "rev": "58cc9f84e456ab0510b13d7bdbc13697467ca7be", + "type": "gitlab" + } + }, + "plymouth-theme-src": { + "flake": false, + "locked": { + "lastModified": 1610597442, + "narHash": "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=", + "owner": "dracula", + "repo": "plymouth", + "rev": "37aa09b27ecee4a825b43d2c1d20b502e8f19c96", + "type": "github" + }, + "original": { + "owner": "dracula", + "repo": "plymouth", + "type": "github" + } + }, + "pokemon-colorscripts-src": { + "flake": false, + "locked": { + "lastModified": 1666991310, + "narHash": "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A=", + "owner": "phoneybadger", + "repo": "pokemon-colorscripts", + "rev": "0483c85b93362637bdd0632056ff986c07f30868", + "type": "gitlab" + }, + "original": { + "owner": "phoneybadger", + "repo": "pokemon-colorscripts", + "type": "gitlab" + } + }, "root": { "inputs": { "ags": "ags", + "bat-theme-src": "bat-theme-src", "caddy-plugins": "caddy-plugins", "coc-stylelintplus-flake": "coc-stylelintplus-flake", + "git-theme-src": "git-theme-src", + "gpu-screen-recorder-src": "gpu-screen-recorder-src", + "gtk-theme-src": "gtk-theme-src", "headscale": "headscale", "home-manager": "home-manager", "hyprgrass": "hyprgrass", @@ -949,8 +1084,15 @@ "nms": "nms", "nur": "nur", "nurl": "nurl", + "pam-fprint-grosshack-src": "pam-fprint-grosshack-src", + "plymouth-src": "plymouth-src", + "plymouth-theme-src": "plymouth-theme-src", + "pokemon-colorscripts-src": "pokemon-colorscripts-src", "secrets": "secrets", - "tree-sitter-hypr-flake": "tree-sitter-hypr-flake" + "spotifywm-src": "spotifywm-src", + "trash-d-src": "trash-d-src", + "tree-sitter-hypr-flake": "tree-sitter-hypr-flake", + "xresources-theme-src": "xresources-theme-src" } }, "secrets": { @@ -996,6 +1138,22 @@ "type": "github" } }, + "spotifywm-src": { + "flake": false, + "locked": { + "lastModified": 1666732863, + "narHash": "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=", + "owner": "dasJ", + "repo": "spotifywm", + "rev": "8624f539549973c124ed18753881045968881745", + "type": "github" + }, + "original": { + "owner": "dasJ", + "repo": "spotifywm", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1086,6 +1244,22 @@ "type": "github" } }, + "trash-d-src": { + "flake": false, + "locked": { + "lastModified": 1692895205, + "narHash": "sha256-oPxeoEqOYf6DCg5rJxINqAIlMbxqzAJcZDUY/EzADzY=", + "owner": "rushsteve1", + "repo": "trash-d", + "rev": "d88bb672612761c8e299e717857bf9c85a903e99", + "type": "github" + }, + "original": { + "owner": "rushsteve1", + "repo": "trash-d", + "type": "github" + } + }, "tree-sitter-hypr-flake": { "inputs": { "flake-utils": "flake-utils_5", @@ -1176,6 +1350,22 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "xresources-theme-src": { + "flake": false, + "locked": { + "lastModified": 1647833631, + "narHash": "sha256-6fltsAluqOqYIh2NX0I/LC3WCWkb9Fn8PH6LNLBQbrY=", + "owner": "dracula", + "repo": "xresources", + "rev": "539ef24e9b0c5498a82d59bfa2bad9b618d832a3", + "type": "github" + }, + "original": { + "owner": "dracula", + "repo": "xresources", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1cd2568..1c7b8f6 100644 --- a/flake.nix +++ b/flake.nix @@ -86,79 +86,248 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # Main inputs + nixpkgs = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "nixos-unstable"; + }; + + home-manager = { + type = "github"; + owner = "nix-community"; + repo = "home-manager"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; + secrets = { - url = "git+ssh://git@git.nelim.org/matt1432/nixos-secrets"; + type = "git"; + url = "ssh://git@git.nelim.org/matt1432/nixos-secrets"; + inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:t184256/nix-on-droid"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; + type = "github"; + owner = "t184256"; + repo = "nix-on-droid"; + + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; }; - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - nur.url = "github:nix-community/NUR"; - - nix-gaming.url = "github:fufexan/nix-gaming"; - - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + # Overlays + nixpkgs-wayland = { + type = "github"; + owner = "nix-community"; + repo = "nixpkgs-wayland"; }; - # Oksys flakes + nur = { + type = "github"; + owner = "nix-community"; + repo = "NUR"; + }; + + nix-gaming = { + type = "github"; + owner = "fufexan"; + repo = "nix-gaming"; + }; + + # Oksys inputs headscale = { - url = "github:juanfont/headscale"; + type = "github"; + owner = "juanfont"; + repo = "headscale"; + inputs.nixpkgs.follows = "nixpkgs"; }; + caddy-plugins = { - url = "github:matt1432/nixos-caddy-cloudflare"; + type = "github"; + owner = "matt1432"; + repo = "nixos-caddy-cloudflare"; + inputs.nixpkgs.follows = "nixpkgs"; }; + # Servivi inputs nms = { - url = "github:matt1432/nixos-minecraft-servers"; + type = "github"; + owner = "matt1432"; + repo = "nixos-minecraft-servers"; + inputs.nixpkgs.follows = "nixpkgs"; }; + # Desktop inputs hyprland = { - url = "github:hyprwm/Hyprland"; + type = "github"; + owner = "hyprwm"; + repo = "Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; }; + hyprgrass = { - url = "github:horriblename/hyprgrass"; + type = "github"; + owner = "horriblename"; + repo = "hyprgrass"; + inputs.hyprland.follows = "hyprland"; }; ags = { - url = "github:Aylur/ags"; + type = "github"; + owner = "Aylur"; + repo = "ags"; + inputs.nixpkgs.follows = "nixpkgs"; }; + # Neovim inputs neovim-flake = { - url = "github:nix-community/neovim-nightly-overlay"; + type = "github"; + owner = "nix-community"; + repo = "neovim-nightly-overlay"; + # to make sure plugins and nvim have same binaries inputs.nixpkgs.follows = "nixpkgs"; }; + coc-stylelintplus-flake = { - url = "github:matt1432/coc-stylelintplus"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - tree-sitter-hypr-flake = { - url = "github:luckasRanarison/tree-sitter-hypr"; + type = "github"; + owner = "matt1432"; + repo = "coc-stylelintplus"; + inputs.nixpkgs.follows = "nixpkgs"; }; - # FIXME: some of these prevent from using nixos-install - nh.url = "github:viperML/nh"; - nix-melt.url = "github:nix-community/nix-melt"; - nurl.url = "github:nix-community/nurl"; + tree-sitter-hypr-flake = { + type = "github"; + owner = "luckasRanarison"; + repo = "tree-sitter-hypr"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # Nix tools + nurl = { + type = "github"; + owner = "nix-community"; + repo = "nurl"; + }; nix-index-db = { - url = "github:Mic92/nix-index-database"; + type = "github"; + owner = "Mic92"; + repo = "nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; }; + + # FIXME: these prevent from using nixos-install + nh = { + type = "github"; + owner = "viperML"; + repo = "nh"; + }; + + nix-melt = { + type = "github"; + owner = "nix-community"; + repo = "nix-melt"; + }; + + # -= Non-flake inputs =- + + ## Custom packages + trash-d-src = { + type = "github"; + owner = "rushsteve1"; + repo = "trash-d"; + flake = false; + }; + + pam-fprint-grosshack-src = { + type = "gitlab"; + owner = "mishakmak"; + repo = "pam-fprint-grosshack"; + flake = false; + }; + + pokemon-colorscripts-src = { + type = "gitlab"; + owner = "phoneybadger"; + repo = "pokemon-colorscripts"; + flake = false; + }; + + ## Overlays + plymouth-src = { + type = "gitlab"; + host = "gitlab.freedesktop.org"; + owner = "plymouth"; + repo = "plymouth"; + + # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236 + # Last commit that works + rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be"; + flake = false; + }; + + spotifywm-src = { + type = "github"; + owner = "dasJ"; + repo = "spotifywm"; + flake = false; + }; + + gpu-screen-recorder-src = { + type = "git"; + url = "https://repo.dec05eba.com/gpu-screen-recorder"; + flake = false; + }; + + ## Dracula src + bat-theme-src = { + type = "github"; + owner = "matt1432"; + repo = "bat"; + flake = false; + }; + + git-theme-src = { + type = "github"; + owner = "dracula"; + repo = "git"; + flake = false; + }; + + gtk-theme-src = { + type = "github"; + owner = "dracula"; + repo = "gtk"; + flake = false; + }; + + plymouth-theme-src = { + type = "github"; + owner = "dracula"; + repo = "plymouth"; + flake = false; + }; + + xresources-theme-src = { + type = "github"; + owner = "dracula"; + repo = "xresources"; + flake = false; + }; }; } diff --git a/home/theme.nix b/home/theme.nix index 969968d..25e5c42 100644 --- a/home/theme.nix +++ b/home/theme.nix @@ -46,7 +46,7 @@ xresources.extraConfig = builtins.readFile - "${pkgs.dracula-theme}/xres/Xresources"; + "${pkgs.dracula-theme}/xres"; xdg.configFile = let qtconf = '' diff --git a/modules/audio.nix b/modules/audio.nix index 32e347e..fe7df89 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -1,7 +1,5 @@ {nix-gaming, ...}: { - imports = [ - nix-gaming.nixosModules.pipewireLowLatency - ]; + imports = [nix-gaming.nixosModules.pipewireLowLatency]; hardware.pulseaudio.enable = false; diff --git a/updateSha.sh b/updateSha.sh index 98e4bd4..dbcad4e 100755 --- a/updateSha.sh +++ b/updateSha.sh @@ -21,29 +21,6 @@ parseFetchurl() { sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE" } - -updateOverlays() { - FILE="/home/matt/.nix/common/overlays" - parseNurl "https://github.com/dasJ/spotifywm" "$FILE/spotifywm/spotifywm.nix" -} - -updateDracula() { - FILE="/home/matt/.nix/common/overlays/dracula-theme" - parseNurl "https://github.com/matt1432/bat" "$FILE/bat.nix" - parseNurl "https://github.com/dracula/gtk" "$FILE/default.nix" - parseNurl "https://github.com/dracula/plymouth" "$FILE/plymouth.nix" - parseNurl "https://github.com/dracula/git" "$FILE/git.nix" - parseNurl "https://github.com/dracula/xresources" "$FILE/xresources.nix" - parseFetchurl "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true" "$FILE/wallpaper.nix" -} - -updateCustomPkgs() { - FILE="/home/matt/.nix/common/pkgs" - parseNurl "https://github.com/tio/input-emulator" "$FILE/input-emulator/default.nix" - parseNurl "https://gitlab.com/mishakmak/pam-fprint-grosshack" "$FILE/pam-fprint-grosshack/default.nix" - parseNurl "https://gitlab.com/phoneybadger/pokemon-colorscripts" "$FILE/pokemon-colorscripts/default.nix" -} - updateFFZ() { FILE="/home/matt/.nix/home/firefox/addons/default.nix" URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi" @@ -70,43 +47,15 @@ updateFirefoxAddons() { mozilla-addons-to-nix addons.json generated-firefox-addons.nix) } -updateGSR() { - ( - cd /tmp || return - - if [[ ! -d "gpu-screen-recorder" ]]; then - git clone https://repo.dec05eba.com/gpu-screen-recorder - cd gpu-screen-recorder || return - else - cd gpu-screen-recorder || return - git pull - fi - - REV=$(printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)") - URL=https://dec05eba.com/snapshot/gpu-screen-recorder.git."$REV".tar.gz - FILE="/home/matt/.nix/devices/binto/modules/gpu-replay.nix" - - parseFetchurl "$URL" "$FILE" - ) -} - doAll() { updateFFZ - updateCustomPkgs - updateOverlays - updateDracula updateFirefoxAddons - updateGSR } [[ "$1" == "-a" || "$1" == "--all" ]] && doAll -[[ "$1" == "-d" || "$1" == "--dracula" ]] && updateDracula -[[ "$1" == "-c" || "$1" == "--custom" ]] && updateCustomPkgs -[[ "$1" == "-o" || "$1" == "--overlays" ]] && updateOverlays [[ "$1" == "-f" || "$1" == "--firefox" ]] && updateFirefoxAddons [[ "$1" == "-ffz" || "$1" == "--frankerfacez" ]] && updateFFZ -[[ "$1" == "-gsr" || "$1" == "--gpu-screen-recorder" ]] && updateGSR alejandra /home/matt/.nix