refactor(nix-hm): various improvements
This commit is contained in:
parent
a0c05a91ca
commit
3e2f78d8bf
@ -71,6 +71,15 @@ in {
|
|||||||
typstfmt
|
typstfmt
|
||||||
typst
|
typst
|
||||||
hurl
|
hurl
|
||||||
|
easyeffects
|
||||||
|
egl-wayland
|
||||||
|
] ++ [
|
||||||
|
libsForQt5.qtstyleplugins
|
||||||
|
libsForQt5.qtcurve
|
||||||
|
qt6Packages.qt6gtk2
|
||||||
|
gtk-engine-murrine
|
||||||
|
gnome.gnome-themes-extra
|
||||||
|
gtk_engines
|
||||||
] ++ [ ansible ansible-lint ] ++ [
|
] ++ [ ansible ansible-lint ] ++ [
|
||||||
# gnumake
|
# gnumake
|
||||||
# cmake
|
# cmake
|
||||||
@ -101,6 +110,7 @@ in {
|
|||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
GTK_THEME = "Kanagawa-Borderless";
|
GTK_THEME = "Kanagawa-Borderless";
|
||||||
QT_QPA_PLATFORMTHEME = "${gtkStyle}";
|
QT_QPA_PLATFORMTHEME = "${gtkStyle}";
|
||||||
|
GTK_PATH = "${config.home.homeDirectory}/.nix-profile/lib/gtk-2.0";
|
||||||
# LD_LIBRARY_PATH = "${config.home.homeDirectory}/.nix-profile/lib";
|
# LD_LIBRARY_PATH = "${config.home.homeDirectory}/.nix-profile/lib";
|
||||||
# PKG_CONFIG_PATH = "${config.home.homeDirectory}/.nix-profile/lib/pkgconfig";
|
# PKG_CONFIG_PATH = "${config.home.homeDirectory}/.nix-profile/lib/pkgconfig";
|
||||||
};
|
};
|
||||||
@ -133,6 +143,11 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
qt = {
|
||||||
|
enable = true;
|
||||||
|
platformTheme = "gtk";
|
||||||
|
};
|
||||||
|
|
||||||
gtk = let
|
gtk = let
|
||||||
extraGtkConfig = {
|
extraGtkConfig = {
|
||||||
gtk-application-prefer-dark-theme = true;
|
gtk-application-prefer-dark-theme = true;
|
||||||
@ -162,34 +177,16 @@ in {
|
|||||||
gtk4.extraConfig = extraGtkConfig;
|
gtk4.extraConfig = extraGtkConfig;
|
||||||
};
|
};
|
||||||
|
|
||||||
services = { cliphist = { enable = true; }; };
|
services = {
|
||||||
|
cliphist.enable = true;
|
||||||
|
easyeffects.enable = true;
|
||||||
|
opensnitch-ui.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
systemd.user = {
|
systemd.user = {
|
||||||
targets.compositor = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Compositor target for WM";
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services = {
|
services = {
|
||||||
opensnitch-ui = {
|
opensnitch-ui.Unit.ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||||
Unit = {
|
easyeffects.Unit.ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||||
Description = "Opensnitch ui";
|
|
||||||
PartOf = [ "compositor.target" ];
|
|
||||||
After = [ "compositor.target" ];
|
|
||||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
Service = { ExecStart = "${pkgs.opensnitch-ui}/bin/opensnitch-ui"; };
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
QT_QPA_PLATFORMTHEME = "${gtkStyle}";
|
|
||||||
PATH = "${config.home.profileDirectory}/bin";
|
|
||||||
};
|
|
||||||
|
|
||||||
Install = { WantedBy = [ "compositor.target" ]; };
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
118
flake.lock
118
flake.lock
@ -10,7 +10,7 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1,
|
"lastModified": 1,
|
||||||
"narHash": "sha256-dRRtI4CfEMyPwPv8zwKkSfOZaGGsXVoUg2Lgp0yIj2M=",
|
"narHash": "sha256-6cl1q7lxmZDhRtjfRpPCFS4PfSV/o+QSPdmf0Wqdrg4=",
|
||||||
"path": "./pkgs/bob-nvim",
|
"path": "./pkgs/bob-nvim",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
@ -35,18 +35,54 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"deepfilternet": {
|
||||||
|
"inputs": {
|
||||||
|
"deepfilternet-src": "deepfilternet-src",
|
||||||
|
"flake-utils": "flake-utils_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1,
|
||||||
|
"narHash": "sha256-abU7HokEfv6JC76SPSMQZsoflzDfL58rfgaiPy4fX9E=",
|
||||||
|
"path": "./pkgs/deepfilternet",
|
||||||
|
"type": "path"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"path": "./pkgs/deepfilternet",
|
||||||
|
"type": "path"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"deepfilternet-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1693481377,
|
||||||
|
"narHash": "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=",
|
||||||
|
"owner": "Rikorose",
|
||||||
|
"repo": "DeepFilterNet",
|
||||||
|
"rev": "978576aa8400552a4ce9730838c635aa30db5e61",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Rikorose",
|
||||||
|
"repo": "DeepFilterNet",
|
||||||
|
"rev": "978576aa8400552a4ce9730838c635aa30db5e61",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_3",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706807251,
|
"lastModified": 1707099004,
|
||||||
"narHash": "sha256-FIQFLSw/5s6Urs9RtZP7FzXCyyBCrmFEc2N0iwmgYe8=",
|
"narHash": "sha256-O5LZdwF6QL6Vt8RVnmtiYIt0ZD/vhwnHf2k4sHG8xog=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "ad0b983479cb072cb0e97c9609c11d9e5aeced34",
|
"rev": "b7c67b5f71db89ec27e1aa4413fbbcdf5bbfa451",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -153,6 +189,24 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_4": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_4"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701680307,
|
"lastModified": 1701680307,
|
||||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||||
@ -167,9 +221,9 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705309234,
|
"lastModified": 1705309234,
|
||||||
@ -248,11 +302,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706798041,
|
"lastModified": 1707088232,
|
||||||
"narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=",
|
"narHash": "sha256-nxPBAZ//BwKkBcjwLE5g9zTq29g7gccTnH5+CeMTxpA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e",
|
"rev": "4740f2ccda184e9cc509d7a82b26d7271e0c79d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -280,7 +334,7 @@
|
|||||||
},
|
},
|
||||||
"neovim-flake": {
|
"neovim-flake": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"neovim-nightly-overlay",
|
"neovim-nightly-overlay",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
@ -326,11 +380,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706550542,
|
"lastModified": 1706913249,
|
||||||
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
|
"narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
|
"rev": "e92b6015881907e698782c77641aa49298330223",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -342,11 +396,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706515015,
|
"lastModified": 1706826059,
|
||||||
"narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
|
"narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
|
"rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -374,11 +428,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706683685,
|
"lastModified": 1706925685,
|
||||||
"narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=",
|
"narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d",
|
"rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -391,6 +445,7 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"bob": "bob",
|
"bob": "bob",
|
||||||
|
"deepfilternet": "deepfilternet",
|
||||||
"emacs-overlay": "emacs-overlay",
|
"emacs-overlay": "emacs-overlay",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||||
@ -483,9 +538,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"wezterm": {
|
"wezterm": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_5",
|
||||||
"freetype2": "freetype2",
|
"freetype2": "freetype2",
|
||||||
"harfbuzz": "harfbuzz",
|
"harfbuzz": "harfbuzz",
|
||||||
"libpng": "libpng",
|
"libpng": "libpng",
|
||||||
@ -497,11 +567,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "nix",
|
"dir": "nix",
|
||||||
"lastModified": 1706833122,
|
"lastModified": 1707064947,
|
||||||
"narHash": "sha256-IcOZrCP7uSapBRuAYoXeXE8G9TdaSWgRM9pJkf0rkTw=",
|
"narHash": "sha256-m76FLPey25grg+KmL2u9S0TEyDBQxvALYkKnqGQHO7k=",
|
||||||
"owner": "wez",
|
"owner": "wez",
|
||||||
"repo": "wezterm",
|
"repo": "wezterm",
|
||||||
"rev": "17dadbeb1e170dc76c97afcdeae4ed27a50e99e5",
|
"rev": "bed5141d6e07f2e82ad68cb73feb7b7949460aad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
34
flake.nix
34
flake.nix
@ -7,6 +7,10 @@
|
|||||||
url = "path:./pkgs/bob-nvim";
|
url = "path:./pkgs/bob-nvim";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
deepfilternet = {
|
||||||
|
url = "path:./pkgs/deepfilternet";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -19,37 +23,37 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ { home-manager, nixpkgs, ... }:
|
outputs = inputs@{ home-manager, nixpkgs, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
username = "sam";
|
username = "sam";
|
||||||
in
|
lib = nixpkgs.lib;
|
||||||
{
|
in {
|
||||||
defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
|
defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
|
||||||
targets.genericLinux.enable = true;
|
targets.genericLinux.enable = true;
|
||||||
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration rec {
|
homeConfigurations.${username} =
|
||||||
|
home-manager.lib.homeManagerConfiguration rec {
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = { inherit inputs; };
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
({
|
({
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
inputs.neovim-nightly-overlay.overlay
|
inputs.neovim-nightly-overlay.overlay
|
||||||
inputs.emacs-overlay.overlays.emacs
|
inputs.emacs-overlay.overlays.emacs
|
||||||
(self: super: {
|
inputs.bob.overlays.default
|
||||||
kanagawa-gtk-theme = super.callPackage ./pkgs/kanagawa-gtk { };
|
inputs.deepfilternet.overlays.default
|
||||||
lxappearance = super.lxappearance.overrideAttrs (oldAttrs: {
|
(final: prev:
|
||||||
|
{
|
||||||
|
kanagawa-gtk-theme = prev.callPackage ./pkgs/kanagawa-gtk { };
|
||||||
|
lxappearance = prev.lxappearance.overrideAttrs (oldAttrs: {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/lxappearance --prefix GDK_BACKEND : x11
|
wrapProgram $out/bin/lxappearance --prefix GDK_BACKEND : x11
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
bob-nvim = inputs.bob.overlays.${system}.default;
|
opensnitch-ui = prev.opensnitch-ui.overrideAttrs
|
||||||
opensnitch-ui = super.opensnitch-ui.overrideAttrs
|
|
||||||
(oldAttrs: rec {
|
(oldAttrs: rec {
|
||||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
|
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
|
||||||
super.python311Packages.qt-material
|
++ [ prev.python311Packages.qt-material ];
|
||||||
];
|
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user