Compare commits
37 Commits
main
...
2958cc4c7a
| Author | SHA1 | Date | |
|---|---|---|---|
| 2958cc4c7a | |||
| d48193d65c | |||
| 5a5730a840 | |||
| 660239293e | |||
| 6a050e055a | |||
| 0d97edd9d9 | |||
| f6ecefbd91 | |||
| 02178cce00 | |||
| f4e805677e | |||
| e8200048fa | |||
| 7b56ec9f1e | |||
| df782e7507 | |||
| c16f90e8bd | |||
| b4694c2798 | |||
| ff5927e304 | |||
| 2e8145f0f1 | |||
| d38ed9651b | |||
| 7899f32aba | |||
| f810e561fa | |||
| 0b01ed04f5 | |||
| 4e97947206 | |||
| b7b18f664e | |||
|
b277018b88
|
|||
| 84ab691a7f | |||
| 71623b5964 | |||
| ee0bc337e6 | |||
|
4bf86c7b37
|
|||
|
4b6d42d275
|
|||
|
a67a4f5826
|
|||
| 5659cceab5 | |||
| 2921f3f435 | |||
| 319d292fa0 | |||
| 1eb4476006 | |||
| 338246498d | |||
| f396b3a8fb | |||
| 15a39660eb | |||
| d64caa86ec |
169
#flake.nix#
Normal file
169
#flake.nix#
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
{
|
||||||
|
description = "Home Manager configuration of phundrak";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
|
devenv = {
|
||||||
|
url = "github:cachix/devenv";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager = {
|
||||||
|
url = "github:nix-community/home-manager";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
nix-index-database = {
|
||||||
|
url = "github:nix-community/nix-index-database";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
pumo-system-info = {
|
||||||
|
url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
quickshell = {
|
||||||
|
url = "git+https://git.outfoxxed.me/quickshell/quickshell";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
sops-nix = {
|
||||||
|
url = "github:Mic92/sops-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
claude-desktop = {
|
||||||
|
url = "github:k3d3/claude-desktop-linux-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
zen-browser = {
|
||||||
|
url = "github:youwen5/zen-browser-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nixConfig = {
|
||||||
|
extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
|
||||||
|
extra-substituters = "https://devenv.cachix.org";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = {
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
devenv,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
|
inherit (self) outputs;
|
||||||
|
system = "x86_64-linux";
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
in {
|
||||||
|
formatter.${system} = pkgs.alejandra;
|
||||||
|
|
||||||
|
packages.${system} = {
|
||||||
|
devenv-up = self.devShells.${system}.default.config.procfileScript;
|
||||||
|
devenv-test = self.devShells.${system}.default.config.test;
|
||||||
|
};
|
||||||
|
|
||||||
|
devShells.${system}.default = devenv.lib.mkShell {
|
||||||
|
inherit inputs pkgs;
|
||||||
|
modules = [
|
||||||
|
(
|
||||||
|
{pkgs, ...}: {
|
||||||
|
packages = [pkgs.nh];
|
||||||
|
git-hooks.hooks = {
|
||||||
|
alejandra.enable = true;
|
||||||
|
commitizen.enable = true;
|
||||||
|
detect-private-keys.enable = true;
|
||||||
|
end-of-file-fixer.enable = true;
|
||||||
|
deadnix.enable = true;
|
||||||
|
ripsecrets.enable = true;
|
||||||
|
statix.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
homeConfigurations = let
|
||||||
|
extraSpecialArgs = {inherit inputs outputs system;};
|
||||||
|
in {
|
||||||
|
"phundrak@alys" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./users/phundrak/host/alys.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
# extraSpecialArgs = {
|
||||||
|
# inherit inputs outputs;
|
||||||
|
# };
|
||||||
|
inherit extraSpecialArgs;
|
||||||
|
modules = [
|
||||||
|
./users/phundrak/host/marpa.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./users/phundrak/host/gampo.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./users/phundrak/host/tilo.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nixosConfigurations = let
|
||||||
|
specialArgs = {inherit inputs outputs;};
|
||||||
|
in {
|
||||||
|
alys = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {inherit inputs outputs;};
|
||||||
|
modules = [
|
||||||
|
./hosts/alys/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
gampo = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {inherit inputs outputs;};
|
||||||
|
modules = [
|
||||||
|
./hosts/gampo/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
marpa = nixpkgs.lib.nixosSystem {
|
||||||
|
inherit specialArgs; modules = [
|
||||||
|
./hosts/marpa/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
tilo = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {inherit inputs outputs;};
|
||||||
|
modules = [
|
||||||
|
./hosts/tilo/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
50
flake.lock
generated
50
flake.lock
generated
@@ -41,11 +41,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764098187,
|
"lastModified": 1761825061,
|
||||||
"narHash": "sha256-H6JjWXhKqxZ8QLMoqndZx9e5x0Sv5AiipSmqvIxIbgo=",
|
"narHash": "sha256-AeRQZKr8+1XQer+WmbwtQaQBy05UDgeNNE7YZjNLuS0=",
|
||||||
"owner": "k3d3",
|
"owner": "k3d3",
|
||||||
"repo": "claude-desktop-linux-flake",
|
"repo": "claude-desktop-linux-flake",
|
||||||
"rev": "b2b040cb68231d2118906507d9cc8fd181ca6308",
|
"rev": "791cd93cfe216ad06ab740f0fdc142119b1d6ec2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764669403,
|
"lastModified": 1761922975,
|
||||||
"narHash": "sha256-aJCOp0CV/9KIR2LTwSbZZN3j9Avg7umYyaqDFPoOVhI=",
|
"narHash": "sha256-j4EB5ku/gDm7h7W7A+k70RYj5nUiW/l9wQtXMJUD2hg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "devenv",
|
"repo": "devenv",
|
||||||
"rev": "3f2d25e7af748127da0571266054575dd8fec5ab",
|
"rev": "c9f0b47815a4895fadac87812de8a4de27e0ace1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -207,11 +207,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764780230,
|
"lastModified": 1761878381,
|
||||||
"narHash": "sha256-/hLZoLxzr2jwMStuUofB6PZm2eE3kpw91WObm66vPUs=",
|
"narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "af324afa72de6d23162f0cdcb0716afe6e626683",
|
"rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -267,11 +267,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764475780,
|
"lastModified": 1761451000,
|
||||||
"narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=",
|
"narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0",
|
"rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -282,11 +282,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1761907660,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -325,11 +325,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764663772,
|
"lastModified": 1761897390,
|
||||||
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
|
"narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
|
"rev": "fc704e6b5d445899a1565955268c91942a4f263f",
|
||||||
"revCount": 713,
|
"revCount": 700,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
||||||
},
|
},
|
||||||
@@ -379,11 +379,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764483358,
|
"lastModified": 1760998189,
|
||||||
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
|
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "5aca6ff67264321d47856a2ed183729271107c9c",
|
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -429,11 +429,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764648680,
|
"lastModified": 1761883599,
|
||||||
"narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",
|
"narHash": "sha256-ntnfAAqSuXI/+uqXAWUjbY5arB7sRK9cpgFbHbCZgK8=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",
|
"rev": "5355c0dc6857a2aa34b126fb4a93a454ed702f52",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
48
flake.nix
48
flake.nix
@@ -91,51 +91,67 @@
|
|||||||
homeConfigurations = let
|
homeConfigurations = let
|
||||||
extraSpecialArgs = {inherit inputs outputs system;};
|
extraSpecialArgs = {inherit inputs outputs system;};
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
defaultUserModules = [
|
|
||||||
inputs.sops-nix.homeManagerModules.sops
|
|
||||||
];
|
|
||||||
withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]);
|
|
||||||
in {
|
in {
|
||||||
"phundrak@alys" = home-manager.lib.homeManagerConfiguration {
|
"phundrak@alys" = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit extraSpecialArgs pkgs;
|
inherit extraSpecialArgs pkgs;
|
||||||
modules = withUserModules ./users/phundrak/host/alys.nix;
|
modules = [
|
||||||
|
./users/phundrak/host/alys.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
"phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
|
"phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit extraSpecialArgs pkgs;
|
inherit extraSpecialArgs pkgs;
|
||||||
modules = withUserModules ./users/phundrak/host/marpa.nix;
|
modules = [
|
||||||
|
./users/phundrak/host/marpa.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
"phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
|
"phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit extraSpecialArgs pkgs;
|
inherit extraSpecialArgs pkgs;
|
||||||
modules = withUserModules ./users/phundrak/host/gampo.nix;
|
modules = [
|
||||||
|
./users/phundrak/host/gampo.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
"phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
|
"phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit extraSpecialArgs pkgs;
|
inherit extraSpecialArgs pkgs;
|
||||||
modules = withUserModules ./users/phundrak/host/tilo.nix;
|
modules = [
|
||||||
|
./users/phundrak/host/tilo.nix
|
||||||
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = let
|
nixosConfigurations = let
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
defaultSystemModules = [
|
|
||||||
inputs.sops-nix.nixosModules.sops
|
|
||||||
];
|
|
||||||
withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
|
|
||||||
in {
|
in {
|
||||||
alys = nixpkgs.lib.nixosSystem {
|
alys = nixpkgs.lib.nixosSystem {
|
||||||
inherit specialArgs;
|
inherit specialArgs;
|
||||||
modules = withSystemModules ./hosts/alys/configuration.nix;
|
modules = [
|
||||||
|
./hosts/alys/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
gampo = nixpkgs.lib.nixosSystem {
|
gampo = nixpkgs.lib.nixosSystem {
|
||||||
inherit specialArgs;
|
inherit specialArgs;
|
||||||
modules = withSystemModules ./hosts/gampo/configuration.nix;
|
modules = [
|
||||||
|
./hosts/gampo/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
marpa = nixpkgs.lib.nixosSystem {
|
marpa = nixpkgs.lib.nixosSystem {
|
||||||
inherit specialArgs;
|
inherit specialArgs;
|
||||||
modules = withSystemModules ./hosts/marpa/configuration.nix;
|
modules = [
|
||||||
|
./hosts/marpa/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
tilo = nixpkgs.lib.nixosSystem {
|
tilo = nixpkgs.lib.nixosSystem {
|
||||||
inherit specialArgs;
|
inherit specialArgs;
|
||||||
modules = withSystemModules ./hosts/tilo/configuration.nix;
|
modules = [
|
||||||
|
./hosts/tilo/configuration.nix
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,11 +34,9 @@
|
|||||||
};
|
};
|
||||||
hardware = {
|
hardware = {
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
input = {
|
|
||||||
corne.allowHidAccess = true;
|
corne.allowHidAccess = true;
|
||||||
ibmTrackpoint.disable = true;
|
ibmTrackpoint.disable = true;
|
||||||
opentablet.enable = true;
|
opentablet.enable = true;
|
||||||
};
|
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
};
|
};
|
||||||
misc.keymap = "fr-bepo";
|
misc.keymap = "fr-bepo";
|
||||||
|
|||||||
@@ -9,36 +9,6 @@
|
|||||||
../../system
|
../../system
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems = {
|
|
||||||
"/home".options = [
|
|
||||||
"compress=zstd:3" # Good balance of compression vs speed
|
|
||||||
"space_cache=v2" # Better performance
|
|
||||||
"noatime" # Don't update access times (less writes)
|
|
||||||
];
|
|
||||||
"/mnt/ai" = {
|
|
||||||
device = "/dev/disk/by-uuid/47e87286-caaa-4e43-b2fd-b9eceac90fe9";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"compress=zstd:3" # Good balance of compression vs speed
|
|
||||||
"space_cache=v2" # Better performance
|
|
||||||
"noatime" # Don't update access times (less writes)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"/mnt/games" = {
|
|
||||||
device = "/dev/disk/by-uuid/a8453133-76dc-44bd-a825-444c3305fd9b";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"compress=zstd:3" # Good balance of compression vs speed
|
|
||||||
"space_cache=v2" # Better performance
|
|
||||||
"noatime" # Don't update access times (less writes)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"/games" = {
|
|
||||||
device = "/dev/disk/by-uuid/77d32db8-2e85-4593-b6b8-55d4f9d14e1a";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
mySystem = {
|
mySystem = {
|
||||||
boot = {
|
boot = {
|
||||||
extraModprobeConfig = ''
|
extraModprobeConfig = ''
|
||||||
@@ -68,10 +38,8 @@
|
|||||||
hardware = {
|
hardware = {
|
||||||
amdgpu.enable = true;
|
amdgpu.enable = true;
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
input = {
|
|
||||||
corne.allowHidAccess = true;
|
corne.allowHidAccess = true;
|
||||||
opentablet.enable = true;
|
opentablet.enable = true;
|
||||||
};
|
|
||||||
sound = {
|
sound = {
|
||||||
enable = true;
|
enable = true;
|
||||||
jack = true;
|
jack = true;
|
||||||
@@ -122,16 +90,16 @@
|
|||||||
mode = "0440";
|
mode = "0440";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.udev.extraHwdb = ''
|
|
||||||
mouse:usb:047d:80a6:*
|
|
||||||
LIBINPUT_MIDDLE_EMULATION_ENABLED=1
|
|
||||||
'';
|
|
||||||
|
|
||||||
security = {
|
security = {
|
||||||
polkit.enable = true;
|
polkit.enable = true;
|
||||||
rtkit.enable = true;
|
rtkit.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/games" = {
|
||||||
|
device = "/dev/disk/by-uuid/77d32db8-2e85-4593-b6b8-55d4f9d14e1a";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
extraHosts: ENC[AES256_GCM,data:i2B5DEjVm7P0V77oVzGIgU08dcpmxy8EgoJz4nPuhfpOBZI1BQpRTOOoSVRZzY6SNpLQCcNDVCwvuhtS12w7NAgIFvBhSigzwJVaWZiC78qTjXanbjSW6fvT1SQqb+YOD+4qkpuuxT5pdBKkyHZvjGM6elyA0K6JzpiCE33+Ag/4SIFTyDrdhJN2HQule54aBDVObg5s7zmPnDo9bCX0XXXCbFpdOfJMKI+89c+Gfm0dJrnDwHcks3p1ZrrSfLn3NhC+Rryc8FHMCtw936WKv+TcP124XGYxXrdEFKngB/pJLhUZlzDeC4v33xtPemOdQrK7vGjO0YZ7WBbO5oXvHw6R1pqC7iMDWjKQBbPit8IB3rngXeMOPEHxbEp1W0MEHbp3bg4GH/SAnxKkfeAFxhMNMBolO12KTntaLCurTSKXhXCIn9SSxFcoWK6kIeo6cpejcHdqGbtV8eL3znZ+MXzvEDRwiy5Sofxa31aAoItwX7kK1YHbpMT95jfr8rKc4yR7tkJWmJkmU494x/lhLkyQbXj25cNcJE7v+hLtQkJ1gdHRgYxYJFxG+VbroSS5HjkRvameuLMfk5dHxg+0bifXEV1FjhKtZqM5JQNEFOHUzvrs5u8m3NKNr13onuT5soh3GKAlh8AMX7p5Etud0BpQPdU7HT5WXRyuP7JMZL5wsjRsGWRxnQaQbnV6qg1b1JP25b6iRj0DFHZJeIEEOU20wDwDQDCoXzJS8vlMbZOC0W9/NVWgwz+UAWQz/yxzRGbconWr6zUhvwcwYBtDhYb6KD0GFxn6yfB/zfMvRHZz8AFF4w00Bx4F2L3nvF4lltnkHkdy9Qql6RsshsVFpPjrhzCrABFBrP0js1OCRw==,iv:Mx7LgF/1z/aZtyvIYafELx2tg2VZ3wTpV0zI04DLxU0=,tag:ZZImkH5/6atDOIzaXJC0Bg==,type:str]
|
extraHosts: ENC[AES256_GCM,data:YRHvHINgAQv4z+8awMzHY1uZS/K9qSaFsk8G5J2zF5P5YOt4x62eefXgmhWeKZzJI5AIi0312iMQl5qGv+lAkP+VC7j/h1rh7peBDEBU6LvcMgFU2XqxidM/CoKfMkJF8+/4bb+3r1LC/rEeXITTUQsOmoacdyCeKe5yxLaHyic/FaZIJq13wCg/QQSLfenc2Db0Pbxv5/cbRILhKT+ssElVipA40aZpgL7QmD542vObSEa6K4fZd0rawF/nOyibfpPN7Ak8DrYvfygNMw/QAGKY2XosxC86tjxhrIBHRakqmWpV+smoUO6XBFjU2sbwalafYVFdrvYL9BVAPtMZ25Sc5QMm87RCHqzqYdQHKs8C3JpVBHWnyL+0e5DNQrFrml0/FD5nFYsT6zDKVb/rN3YmxvTvKl7FpPKpv3Kke9WG+HnPs90hPy8Jpmg52vLMhaybx6dpJxzcF+ctBSI3J78hfweOCGvNGshCKpME1dujMPctH/kfYcm2j/ixKLjl0ZSbYeI9+l9oURBDwKzmKjAqhwnjuo3sL++ZsRU5Ue1zz9gsxS40R9eYevbq7JiQPX331pY2du1SRoKOxvPpXsDqe+CY5pW2RgPszjEIuDxyoveZolXg/zjlk0Ic/cOxrbflp7bTfQCQqEC7YJ5tRmtctk2lRGQkOFIg9Tn8ReifFxfhDrPFzc8X5vZgH73aqZSd/OkVybI3vEILV5uas0fPL7AHAKnBmeDV3mBNvF8aoZhD5CG8iRd1otta/3AQ660QV8IDoauq8fySC8Kee5B3kG75sqHvwF4Gu6CpSChXkjpiIqVmW0PntJueVHifuGJYkvhkX/CTHK7xm1HhtANnGrk6cr2APjWk1vpOaCmjFNqKTOV9d1HjaNWYTz4AZ+Uq2Za3UzN3oZCtZb96,iv:Z64+4oR/AfSgA7oZ/NPDLOtcmcXO5B4OQIGjOEK1Pf4=,tag:0I/1gXnBH7u6HTbQUz5Fpw==,type:str]
|
||||||
mopidy:
|
mopidy:
|
||||||
spotify: ENC[AES256_GCM,data:SaDT0iSWhsgVOi1s+Nzbr0Mur3t2Zd9z/KIUshGWtbPfkXXIoiJeJFtoZIz5NL/t5FooYsNfU1mGYgDeVYSD4BPibW8hiCYrX6L6OX+Q6ZEWXXx/1eBEs2/q0BrWGvy7frcurq/Px4R3ax0dXJe/YKbpAtU7+bQl,iv:F2zT+uMVBMnSEZqgcRmV8/fc3G/g2fKDuHuBzkyBRN0=,tag:CD8fuOQfe6QCrj4BUh0/xw==,type:str]
|
spotify: ENC[AES256_GCM,data:SaDT0iSWhsgVOi1s+Nzbr0Mur3t2Zd9z/KIUshGWtbPfkXXIoiJeJFtoZIz5NL/t5FooYsNfU1mGYgDeVYSD4BPibW8hiCYrX6L6OX+Q6ZEWXXx/1eBEs2/q0BrWGvy7frcurq/Px4R3ax0dXJe/YKbpAtU7+bQl,iv:F2zT+uMVBMnSEZqgcRmV8/fc3G/g2fKDuHuBzkyBRN0=,tag:CD8fuOQfe6QCrj4BUh0/xw==,type:str]
|
||||||
bandcamp: ENC[AES256_GCM,data:diEx2fbkOR1oUav81jU5bNt/KNmbOaVzLV+G3zBUVXE7nEQpZNqVom0rgNrEVDGzH3u/IaA5eqG5ce9lE0BomeY8Z4MWI1xujhX5KsXdv21aw4UwsNgyLPuWhkN2POUMfCJlvekc/TFfFvJHyysx8aKxeI4dsg==,iv:cxx0cVkjOPG+hMD8JctJHdcICJt7ozpfRBVSCDBo6Ro=,tag:JRjwwvieGaGZJ+k56HWFaw==,type:str]
|
bandcamp: ENC[AES256_GCM,data:diEx2fbkOR1oUav81jU5bNt/KNmbOaVzLV+G3zBUVXE7nEQpZNqVom0rgNrEVDGzH3u/IaA5eqG5ce9lE0BomeY8Z4MWI1xujhX5KsXdv21aw4UwsNgyLPuWhkN2POUMfCJlvekc/TFfFvJHyysx8aKxeI4dsg==,iv:cxx0cVkjOPG+hMD8JctJHdcICJt7ozpfRBVSCDBo6Ro=,tag:JRjwwvieGaGZJ+k56HWFaw==,type:str]
|
||||||
emailPassword: ENC[AES256_GCM,data:LALAvyuNN9bfa8D6ZK1YiFXRfxLOBi9kXA0N0Kr7h18eAI4hWQ==,iv:WtidILFfWCMKylax52JP+X57GfZyYlxJtiwrC6SADik=,tag:NvOrsL3fbmxQZp06GZhUZA==,type:str]
|
emailPassword: ENC[AES256_GCM,data:LALAvyuNN9bfa8D6ZK1YiFXRfxLOBi9kXA0N0Kr7h18eAI4hWQ==,iv:WtidILFfWCMKylax52JP+X57GfZyYlxJtiwrC6SADik=,tag:NvOrsL3fbmxQZp06GZhUZA==,type:str]
|
||||||
ssh:
|
ssh:
|
||||||
hosts: ENC[AES256_GCM,data:nuMA50lZVxi/b2Y95Om00DIXkfHV+5epXzgFJTUk1r78y71/q/1wDa0bb9bqaMhElivDrX2mzS7IplLqLry43VkGAiE00WrdT7pLM+NSDtm7VV3kake7qorkpydxczHeVg5VP/b1FMzpQ1gFoAVg6iY9tYBnfTa5MdQI3ktQBRYWU5XmVMFNquTBG10wOKxgTUdkh6smcYmU5YlDUdeM6gTt9QPSHlglOGCe/w3tuXOWkBNcNtNiwQoaKTwIkhisu8R6h/qwtOBBt0wEpOv+KtdYQ0Y9o7/KiN2mG24+/mASfAYTAhifSnCY0vDe145gkrQzFttzZDI6l4OgjYF9rIsP+hKwUChGObW90HVVKQbJ8oDoG+l9L+IxLxs8v/v1690Xtra+PPvZCgGqhXqpoqBL/OgNdR26p/G8Oid81Nb0ob8DstYLjYlcg7ZjPiruMtRwhKoa4z++pe+poepGAPHdKkLvAvzFUKwcqRfR7RNgNgZR8hFAe7Tg5m3ApF+koGWjcoKCyALgc/hP6LTBmiJuj6OySFl1cTtkKHPsYXa49St+lOB32MXCH2ysAI6860ZcJqpAFTQ1Yd2XYu+Xrbxcm381mE02Tw20+VP2OPyEYt+ida2TKAzM3aXiMGTRpSkwzkKXsRoBskVQxv3z+6c+w87I9ZmoZHqHM7dWcRAuj2bT2ZWeExPyEmUFczMjCcFFEepnlKWOYmkUZmjDfqZ1mtR3bBK271AnVHakS5jajbhhyu6VDMLYIQmBPDFpZnyCE2qgb9FbXBbqoq+qc/9w+7gCdXNnb1tDdiJ8E4k7no6oU5jrRMGHNX3UOMDs/Y9NS0vPsnqBpr7Pf+H6bxncXWoaimijoi1OxvUFMbRvT5uUgP/JNDZDGBhlY3zRiUnDhTuHF5vP8wisqsba7zwpoqIchI3hbxm+lWXt09ZTnR2A1uR3DTlEEjGUMpD5K5CWkgTalgaHYI9jh9n66rYop9evlngZlg5Cth/Lieh/34fcIUzHAQMbxUKqoRU9zHHQJ51AZIovTtegXmgPmQ8fw6F3uBQ5gg+T1CiaCqs5nUd9ERM=,iv:DNg2EEPmylLf2CqR9eqJYzngGizTraPNImIGTJwl8kI=,tag:StZ6H+1ec/i0l94Cv+AhOA==,type:str]
|
hosts: ENC[AES256_GCM,data:j7+Ua5G8dePL5GO+Tf8+hnoJsSfKo2z4I0OcVfSyJ3dc6yyYZVho8iG9bqPAqVR5d7SJr391zCLMJp/jRDpDFLkzQB54udVKI8ob0C2w2xBznPZJsC7qZMptQ+n4IHO1ZROSi/vBadCUfEWKNO9e8gsroBYmliy/31M5IlA85Vx6q4Zx0qIFylfIhBDto3jD2DRcbjWP8NvjJcY7YLrN2sv8RR7QqX1q+0ZxpgFhg+W+a5Dz8JBVsPEdjNJqFAKAmUGKXf4bpEIS5lLUxxZweizEiWgo4nYJgA0kqVYEOiErOPgtpnBKiJlR+fLGuVwdGxVOUMvttZtyIgHc4CWgOJ0h67h4eVii+zeLn0GPJl3i2g5bjOArHKLfkKGduqii4n/1p9VvVTAOn5dj0/NtD2JNJF9kUDr1nMyMa1xA35gzv1vp/U55L6ZU/BRpBPzka6i8nGnCkDVdoUG0DKhN9ooXRpUS9L+W1iz480fzb6i/tfmlhx7Ms1T9VybYFkGLNkxnsrt5Oc24o0XD5/A1j8bJgNWo6aWSA748ZWtN0mXDzB5sH4TVtaZAGlyU9r/x5oCuWPN2qhZ8d2i7g5rceZW5ang/uyXNt8Le5cKvLw3Rhf4BTFhQ6+VJ4/SpdfnLZ17djjbwZO1DT5Nb0RUObcilcwbmUwqvmLbcrdmsfQMOcetRwFpIdoX6MjkRiC1WZ4cz8bMU7ArnK/n15dsIdaiiUfuOJAiBYut1PaJBoZDe8pXzOE6U1s57sejUf1T7NHp2epyevCAYuVG71dAFLn1oLM+FWXuBm6ogFLujoFh7XCVVqdf6j348/ekzBxDIemzS4G1+zflG3AteLWcslGVTNmx0rb3GlSHGNVNZoeHvYAHIIEyWpY4Yd01R8RhjrFXQo9comnpoQXSlFDvuUGTxuUpsariAof4wKLdpqj8Dc4ZaDvd1pAGVh7RBqR4rn4kClbWUVcSFy7QWs9T5Sw0fU/bLL76N6x9Y44P5NQLAJvZ0z8rhIPl0u8OwIhhEwkhWdFLSulk/N7+DVqrRpj7bB5hB8jZWspsl44IdiZWY3UPs7zs=,iv:3q4FYxDWPGyMqeKoSTRxSPvqZXzwg/NeHZh70d38HYM=,tag:jA8/5yi74/mOuu/b83WEeg==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age1ajemtm502nn2n4q7v4j8meyd5mxtcqngkkedxq2pqzuwu78zp93qnw8q48
|
- recipient: age1ajemtm502nn2n4q7v4j8meyd5mxtcqngkkedxq2pqzuwu78zp93qnw8q48
|
||||||
@@ -61,7 +61,7 @@ sops:
|
|||||||
QmJKNDJUY0RSakhwNWlkOVpib0trc1kK0tQxD9I82pjfs54eruu+IjzVUmcVBCPw
|
QmJKNDJUY0RSakhwNWlkOVpib0trc1kK0tQxD9I82pjfs54eruu+IjzVUmcVBCPw
|
||||||
9mp1xKiYRRMXt3YQn6MPiyuuX3l3UB5MH0RJMNtRq0D961rs+iiS5A==
|
9mp1xKiYRRMXt3YQn6MPiyuuX3l3UB5MH0RJMNtRq0D961rs+iiS5A==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-11-28T12:26:45Z"
|
lastmodified: "2025-08-07T09:16:46Z"
|
||||||
mac: ENC[AES256_GCM,data:T4/aWHN9ILjaI1WAyO8VUQz87H0dmWjC3E6WnlNaRmTr5kDgpm6nYJHFGnrEEFUTPzAGluMTJzC3Sji6CqLKX7opOUtoDgUqiNHgz0oz7B28+RFGqxspo3IoCM4lJNrKBkZHnrKJFPUooYKc8aNm/goWWHQ/dL2uQ46Hvx9zK+o=,iv:Xq5XcYxkBCWMLFCgCYmkPgwBWMXpLFBPZY3iTTnXRcs=,tag:ZAPZAAv+qy4BM47aCgK89g==,type:str]
|
mac: ENC[AES256_GCM,data:3PIJps2hoavPJ6ig+943FE73lBhCfxv8vuzmgTtooH386V12/PQN+Opt/ZoIbXU9w21XelZ/C5xPr8rcuw5ADx9K/KjdMm8jyLCO6/+iBf6SjnbC3E0DyiDit50UtWxKc32ryiJ8m5hYfX6O2H8WIGFa+6wp5KISV9pkc09CNZA=,iv:xzwEhhBJQOlde8Ib+tZpv+2CHfR83dFevdwERkYTsTE=,tag:SzdcZH19kSTnNs16754IMw==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.10.2
|
||||||
|
|||||||
@@ -36,9 +36,5 @@ in {
|
|||||||
boot.tmp.cleanOnBoot = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
time.timeZone = cfg.timezone;
|
time.timeZone = cfg.timezone;
|
||||||
console.keyMap = cfg.keymap;
|
console.keyMap = cfg.keymap;
|
||||||
services = {
|
|
||||||
orca.enable = false;
|
|
||||||
envfs.enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,15 +14,10 @@ in {
|
|||||||
autoprune.enable = mkEnableOption "Enable autoprune";
|
autoprune.enable = mkEnableOption "Enable autoprune";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = {
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = mkIf cfg.podman.enable [
|
||||||
[
|
pkgs.podman-desktop
|
||||||
dive # A tool for exploring each layer in a docker image
|
pkgs.podman-compose
|
||||||
grype # Vulnerability scanner for container images and filesystems
|
|
||||||
]
|
|
||||||
++ lists.optionals cfg.podman.enable [
|
|
||||||
podman-compose
|
|
||||||
podman-desktop
|
|
||||||
];
|
];
|
||||||
virtualisation = mkIf cfg.enable {
|
virtualisation = mkIf cfg.enable {
|
||||||
docker = mkIf (!cfg.podman.enable) {
|
docker = mkIf (!cfg.podman.enable) {
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.mySystem.hardware.input.corne;
|
cfg = config.mySystem.hardware.corne;
|
||||||
in {
|
in {
|
||||||
options.mySystem.hardware.input.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
|
options.mySystem.hardware.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
|
||||||
config.services.udev = mkIf cfg.allowHidAccess {
|
config.services.udev = mkIf cfg.allowHidAccess {
|
||||||
extraRules = ''
|
extraRules = ''
|
||||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
|
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
|
||||||
@@ -2,7 +2,9 @@
|
|||||||
imports = [
|
imports = [
|
||||||
./amdgpu.nix
|
./amdgpu.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
|
./corne.nix
|
||||||
|
./ibm-trackpoint.nix
|
||||||
|
./opentablet.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./input
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.mySystem.hardware.input.ibmTrackpoint;
|
cfg = config.mySystem.hardware.ibmTrackpoint;
|
||||||
in {
|
in {
|
||||||
options.mySystem.hardware.input.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
|
options.mySystem.hardware.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
|
||||||
config.services.udev = mkIf cfg.disable {
|
config.services.udev = mkIf cfg.disable {
|
||||||
extraRules = ''
|
extraRules = ''
|
||||||
ATTRS{name}=="*TPPS/2 IBM TrackPoint", ENV{ID_INPUT}="", ENV{ID_INPUT_MOUSE}="", ENV{ID_INPUT_POINTINGSTICK}=""
|
ATTRS{name}=="*TPPS/2 IBM TrackPoint", ENV{ID_INPUT}="", ENV{ID_INPUT_MOUSE}="", ENV{ID_INPUT_POINTINGSTICK}=""
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
imports = [
|
|
||||||
./corne.nix
|
|
||||||
./ibm-trackpoint.nix
|
|
||||||
./opentablet.nix
|
|
||||||
./trackball.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
services.libinput.mouse.middleEmulation = true;
|
|
||||||
}
|
|
||||||
@@ -4,9 +4,9 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.mySystem.hardware.input.opentablet;
|
cfg = config.mySystem.hardware.opentablet;
|
||||||
in {
|
in {
|
||||||
options.mySystem.hardware.input.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
|
options.mySystem.hardware.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
|
||||||
config.hardware.opentabletdriver = mkIf cfg.enable {
|
config.hardware.opentabletdriver = mkIf cfg.enable {
|
||||||
inherit (cfg) enable;
|
inherit (cfg) enable;
|
||||||
daemon.enable = true;
|
daemon.enable = true;
|
||||||
@@ -17,20 +17,6 @@ in {
|
|||||||
localNetworkGameTransfers.openFirewall = true;
|
localNetworkGameTransfers.openFirewall = true;
|
||||||
gamescopeSession.enable = true;
|
gamescopeSession.enable = true;
|
||||||
extraCompatPackages = [pkgs.proton-ge-bin];
|
extraCompatPackages = [pkgs.proton-ge-bin];
|
||||||
package = pkgs.steam.override {
|
|
||||||
extraEnv = {
|
|
||||||
MANGOHUD = true;
|
|
||||||
OBS_VKCAPTURE = true;
|
|
||||||
RADV_TEX_ANISO = 16;
|
|
||||||
};
|
|
||||||
extraLibraries = p: with p; [atk];
|
|
||||||
extraPkgs = pkgs:
|
|
||||||
with pkgs; [
|
|
||||||
qt5.qtmultimedia
|
|
||||||
qt5.qtbase
|
|
||||||
libpulseaudio
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
gamescope = {
|
gamescope = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ in {
|
|||||||
phundrak = mkIf cfg.phundrak.enable {
|
phundrak = mkIf cfg.phundrak.enable {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Lucien Cartier-Tilet";
|
description = "Lucien Cartier-Tilet";
|
||||||
extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"];
|
extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman"];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../keys;
|
openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../keys;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
pkgs.writeShellScriptBin "askpass" ''
|
pkgs.writeShellScriptBin "askpass" ''
|
||||||
${pkgs.rofi}/bin/rofi -dmenu -password -no-fixed-num-lines -p $(printf \"$*\" | sed 's/://')''
|
${pkgs.wofi}/bin/wofi -d -P -L 1 -p "$(printf $1 | sed s/://)"''
|
||||||
|
|||||||
18
users/modules/cli/scripts/rofi-emoji.nix
Normal file
18
users/modules/cli/scripts/rofi-emoji.nix
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
pkgs.writeShellScriptBin "rofi-emoji" ''
|
||||||
|
SELECTED_EMOJI=$(grep -v "#" ~/.config/emoji | ${pkgs.wofi}/bin/wofi --dmenu -p "Select emoji" -i | awk '{print $1}' | tr -d '\n')
|
||||||
|
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||||
|
printf "%s" "$SELECTED_EMOJI" | ${pkgs.wl-clipboard-rs}/bin/wl-copy
|
||||||
|
else
|
||||||
|
printf "%s" "$SELECTED_EMOJI" | ${pkgs.xclip}/bin/xclip -sel clip
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$XDG_SESSION_TYPE" = "wayland" ]
|
||||||
|
then EMOJI=$(${pkgs.wl-clipboard-rs}/bin/wl-paste)
|
||||||
|
else EMOJI=$(${pkgs.xclip}/bin/xclip -o)
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -z "$EMOJI" && notify-send "No emoji copied" -u low && exit
|
||||||
|
EMOJI="$EMOJI copied to clipboard"
|
||||||
|
${pkgs.libnotify}/bin/notify-send -u low "$EMOJI"
|
||||||
|
''
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
pkgs.writeShellScriptBin "ytplay" ''
|
pkgs.writeShellScriptBin "ytplay" ''
|
||||||
URL=$(rofi -dmenu -i -p "Video URL")
|
URL=$(${pkgs.wofi}/bin/wofi --dmenu -i -p "Video URL")
|
||||||
if [ -z "$URL" ]; then
|
if [ -z "$URL" ]; then
|
||||||
echo "You need to provide a URL"
|
echo "You need to provide a URL"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -9,7 +9,7 @@ pkgs.writeShellScriptBin "ytplay" ''
|
|||||||
grep -E "webm.*[0-9]+x[0-9]" | \
|
grep -E "webm.*[0-9]+x[0-9]" | \
|
||||||
awk '{print $3 " " $1}' | \
|
awk '{print $3 " " $1}' | \
|
||||||
sort -gu | \
|
sort -gu | \
|
||||||
rofi -dmenu -i -p "Resolution")
|
${pkgs.wofi}/bin/wofi --dmenu -i -p "Resolution")
|
||||||
mapfile -t RESOLUTION <<< "$RESOLUTION_CHOICE"
|
mapfile -t RESOLUTION <<< "$RESOLUTION_CHOICE"
|
||||||
RESOLUTION_CODE=''${RESOLUTION[0]}
|
RESOLUTION_CODE=''${RESOLUTION[0]}
|
||||||
${pkgs.mpv}/bin/mpv --ytdl-format="''${RESOLUTION_CODE}+bestaudio/best" "$URL"
|
${pkgs.mpv}/bin/mpv --ytdl-format="''${RESOLUTION_CODE}+bestaudio/best" "$URL"
|
||||||
|
|||||||
@@ -7,17 +7,17 @@ with lib; let
|
|||||||
cfg = config.home.desktop;
|
cfg = config.home.desktop;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
./emoji.nix
|
||||||
./eww.nix
|
./eww.nix
|
||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
./kdeconnect.nix
|
./kdeconnect.nix
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
./obs.nix
|
./obs.nix
|
||||||
./qt.nix
|
./qt.nix
|
||||||
./rofi
|
|
||||||
./swaync.nix
|
./swaync.nix
|
||||||
./waybar.nix
|
./waybar.nix
|
||||||
./wlr-which-key.nix
|
|
||||||
./wlsunset.nix
|
./wlsunset.nix
|
||||||
|
./wofi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
options.home.desktop.fullDesktop = mkEnableOption "Enable options for graphical environments";
|
options.home.desktop.fullDesktop = mkEnableOption "Enable options for graphical environments";
|
||||||
@@ -28,7 +28,5 @@ in {
|
|||||||
kitty.enable = mkDefault cfg.fullDesktop;
|
kitty.enable = mkDefault cfg.fullDesktop;
|
||||||
obs.enable = mkDefault cfg.fullDesktop;
|
obs.enable = mkDefault cfg.fullDesktop;
|
||||||
qt.enable = mkDefault cfg.fullDesktop;
|
qt.enable = mkDefault cfg.fullDesktop;
|
||||||
rofi.enable = mkDefault cfg.fullDesktop;
|
|
||||||
wlr-which-key.enable = mkDefault cfg.fullDesktop;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
4739
users/modules/desktop/emoji.nix
Normal file
4739
users/modules/desktop/emoji.nix
Normal file
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,13 @@
|
|||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.home.desktop.hyprland;
|
cfg = config.home.desktop.hyprland;
|
||||||
|
rofi-emoji = import ../cli/scripts/rofi-emoji.nix {inherit pkgs;};
|
||||||
laptops = ["gampo"];
|
laptops = ["gampo"];
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./swaync.nix
|
./swaync.nix
|
||||||
./waybar.nix
|
./waybar.nix
|
||||||
./wlsunset.nix
|
./wlsunset.nix
|
||||||
./hyprpaper.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
options.home.desktop.hyprland = {
|
options.home.desktop.hyprland = {
|
||||||
@@ -34,16 +34,14 @@ in {
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.desktop = {
|
home.desktop = {
|
||||||
hyprpaper.enable = true;
|
|
||||||
rofi.enable = mkDefault true;
|
|
||||||
swaync.enable = mkDefault true;
|
swaync.enable = mkDefault true;
|
||||||
waybar = {
|
waybar = {
|
||||||
enable = mkDefault true;
|
enable = mkDefault true;
|
||||||
battery = mkDefault (builtins.elem cfg.host laptops);
|
battery = mkDefault (builtins.elem cfg.host laptops);
|
||||||
};
|
};
|
||||||
wlsunset.enable = mkDefault true;
|
wlsunset.enable = mkDefault true;
|
||||||
|
wofi.enable = mkDefault true;
|
||||||
};
|
};
|
||||||
services.blueman-applet.enable = true;
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
@@ -51,8 +49,8 @@ in {
|
|||||||
importantPrefixes = ["$left" "$right" "$up" "$down" "$menu"];
|
importantPrefixes = ["$left" "$right" "$up" "$down" "$menu"];
|
||||||
settings = {
|
settings = {
|
||||||
input = {
|
input = {
|
||||||
kb_layout = "fr,us";
|
kb_layout = "fr";
|
||||||
kb_variant = "bepo_afnor,";
|
kb_variant = "bepo_afnor";
|
||||||
# kb_options = "caps:ctrl_modifier";
|
# kb_options = "caps:ctrl_modifier";
|
||||||
numlock_by_default = true;
|
numlock_by_default = true;
|
||||||
follow_mouse = 1;
|
follow_mouse = 1;
|
||||||
@@ -82,7 +80,7 @@ in {
|
|||||||
new_status = "inherit";
|
new_status = "inherit";
|
||||||
};
|
};
|
||||||
workspace = [
|
workspace = [
|
||||||
"10, layoutopt:orientation:bottom"
|
"4, layoutopt:orientation:bottom"
|
||||||
"1, layoutopt:orientation:bottom"
|
"1, layoutopt:orientation:bottom"
|
||||||
];
|
];
|
||||||
decoration = {
|
decoration = {
|
||||||
@@ -107,7 +105,6 @@ in {
|
|||||||
"pactl load-module module-switch-on-connect"
|
"pactl load-module module-switch-on-connect"
|
||||||
"${pkgs.mpc}/bin/mpc stop"
|
"${pkgs.mpc}/bin/mpc stop"
|
||||||
"${pkgs.networkmanagerapplet}/bin/nm-applet"
|
"${pkgs.networkmanagerapplet}/bin/nm-applet"
|
||||||
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@@ -115,12 +112,108 @@ in {
|
|||||||
$right = r
|
$right = r
|
||||||
$up = s
|
$up = s
|
||||||
$down = t
|
$down = t
|
||||||
$menu = rofi -combi-modi drun,calc -show combi
|
$menu = ${pkgs.wofi}/bin/wofi --show drun
|
||||||
|
|
||||||
bind = SUPER, Return, exec, ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux
|
bind = SUPER, Return, exec, ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux
|
||||||
bind = SUPER, Space, exec, ${pkgs.wlr-which-key}/bin/wlr-which-key
|
bind = SUPER, Space, submap, leader
|
||||||
bind = , Print, exec, ${pkgs.wlr-which-key}/bin/wlr-which-key -k s
|
bind = , Print, submap, screenshot
|
||||||
|
|
||||||
|
submap = leader
|
||||||
|
bind = , l, exec, plock
|
||||||
|
bind = , l, submap, reset
|
||||||
|
bind = , a, submap, apps
|
||||||
|
bind = , b, submap, buffers
|
||||||
|
bind = , w, submap, windows
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
|
||||||
|
submap = apps
|
||||||
|
bind = , b, exec, zen
|
||||||
|
bind = , b, submap, reset
|
||||||
|
bind = SHIFT, b, exec, qutebrowser
|
||||||
|
bind = SHIFT, b, submap, reset
|
||||||
|
bind = , d, exec, vesktop
|
||||||
|
bind = , d, submap, reset
|
||||||
|
bind = , e, exec, ${cfg.emacsPkg}/bin/emacsclient -c -n
|
||||||
|
bind = , e, submap, reset
|
||||||
|
bind = , g, exec, ${pkgs.gimp}/bin/gimp
|
||||||
|
bind = , g, submap, reset
|
||||||
|
bind = , n, exec, ${pkgs.nemo}/bin/nemo
|
||||||
|
bind = , n, submap, reset
|
||||||
|
bind = , r, submap, rofi
|
||||||
|
bind = , u, exec, $menu
|
||||||
|
bind = , u, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
submap = buffers
|
||||||
|
bind = , d, killactive,
|
||||||
|
bind = , d, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
submap = resize
|
||||||
|
binde = , $left, resizeactive, -10 0
|
||||||
|
binde = , $right, resizeactive, 10 0
|
||||||
|
binde = , $up, resizeactive, 0 -10
|
||||||
|
binde = , $down, resizeactive, 0 10
|
||||||
|
bind = , q, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
submap = rofi
|
||||||
|
bind = , e, exec, ${rofi-emoji}/bin/rofi-emoji
|
||||||
|
bind = , e, submap, reset
|
||||||
|
bind = , r, exec, $menu
|
||||||
|
bind = , r, submap, reset
|
||||||
|
bind = , y, exec, ytplay
|
||||||
|
bind = , y, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
submap = screenshot
|
||||||
|
bind = , Print, exec, screenshot
|
||||||
|
bind = , Print, submap, reset
|
||||||
|
bind = , d, exec, screenshot -d 3
|
||||||
|
bind = , d, submap, reset
|
||||||
|
bind = Shift, d, exec, screenshot -sced 3
|
||||||
|
bind = Shift, d, submap, reset
|
||||||
|
bind = , e, exec, screenshot -sec
|
||||||
|
bind = , e, submap, reset
|
||||||
|
bind = , s, exec, screenshot -s
|
||||||
|
bind = , s, submap, reset
|
||||||
|
bind = Shift, s, exec, screenshot -sc
|
||||||
|
bind = Shift, s, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
submap = windows
|
||||||
|
bind = , period, submap, resize
|
||||||
|
bind = , $left, movefocus, l
|
||||||
|
bind = , $left, submap, reset
|
||||||
|
bind = , $right, movefocus, r
|
||||||
|
bind = , $right, submap, reset
|
||||||
|
bind = , $up, movefocus, u
|
||||||
|
bind = , $up, submap, reset
|
||||||
|
bind = , $down, movefocus, d
|
||||||
|
bind = , $down, submap, reset
|
||||||
|
bind = SHIFT, $left, movewindow, l
|
||||||
|
bind = SHIFT, $left, submap, reset
|
||||||
|
bind = SHIFT, $right, movewindow, r
|
||||||
|
bind = SHIFT, $right, submap, reset
|
||||||
|
bind = SHIFT, $up, movewindow, u
|
||||||
|
bind = SHIFT, $up, submap, reset
|
||||||
|
bind = SHIFT, $down, movewindow, d
|
||||||
|
bind = SHIFT, $down, submap, reset
|
||||||
|
bind = CTRL_SHIFT, $left, moveworkspacetomonitor, e+0 +1
|
||||||
|
bind = CTRL_SHIFT, $left, submap, reset
|
||||||
|
bind = CTRL_SHIFT, $right, moveworkspacetomonitor, e+0 -1
|
||||||
|
bind = CTRL_SHIFT, $right, submap, reset
|
||||||
|
bind = , d, killactive,
|
||||||
|
bind = , d, submap, reset
|
||||||
|
bind = , f, fullscreen,
|
||||||
|
bind = , f, submap, reset
|
||||||
|
bind = SHIFT, f, togglefloating,
|
||||||
|
bind = SHIFT, f, submap, reset
|
||||||
|
bind = , escape, submap, reset
|
||||||
|
bind = CTRL, g, submap, reset
|
||||||
|
|
||||||
|
submap = reset
|
||||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
||||||
bindl = , XF86AudioPause, exec, playerctl pause
|
bindl = , XF86AudioPause, exec, playerctl pause
|
||||||
bindl = , XF86AudioStop, exec, playerctl stop
|
bindl = , XF86AudioStop, exec, playerctl stop
|
||||||
@@ -134,17 +227,22 @@ in {
|
|||||||
bindl = , XF86MonBrightnessDown, exec, xbacklight -perceived -dec 2
|
bindl = , XF86MonBrightnessDown, exec, xbacklight -perceived -dec 2
|
||||||
bindl = , XF86KbdBrightnessUp, exec, xbacklight -perceived -inc 2
|
bindl = , XF86KbdBrightnessUp, exec, xbacklight -perceived -inc 2
|
||||||
bindl = , XF86KbdBrightnessDown, exec, xbacklight -perceived -dec 2
|
bindl = , XF86KbdBrightnessDown, exec, xbacklight -perceived -dec 2
|
||||||
bind = SUPER, a, exec, hyprctl switchxkblayout glove80-keyboard next
|
|
||||||
bind = SUPER, $left, movefocus, l
|
bind = SUPER, $left, movefocus, l
|
||||||
bind = SUPER, $right, movefocus, r
|
bind = SUPER, $right, movefocus, r
|
||||||
bind = SUPER, $up, movefocus, u
|
bind = SUPER, $up, movefocus, u
|
||||||
bind = SUPER, $down, movefocus, d
|
bind = SUPER, $down, movefocus, d
|
||||||
bind = SUPER_SHIFT, $left, movewindow, l
|
bind = SUPER_SHIFT, $left, movewindow, l
|
||||||
|
bind = SUPER_SHIFT, $left, submap, reset
|
||||||
bind = SUPER_SHIFT, $right, movewindow, r
|
bind = SUPER_SHIFT, $right, movewindow, r
|
||||||
|
bind = SUPER_SHIFT, $right, submap, reset
|
||||||
bind = SUPER_SHIFT, $up, movewindow, u
|
bind = SUPER_SHIFT, $up, movewindow, u
|
||||||
|
bind = SUPER_SHIFT, $up, submap, reset
|
||||||
bind = SUPER_SHIFT, $down, movewindow, d
|
bind = SUPER_SHIFT, $down, movewindow, d
|
||||||
|
bind = SUPER_SHIFT, $down, submap, reset
|
||||||
bind = SUPER_CTRL_SHIFT, $left, moveworkspacetomonitor, e+0 +1
|
bind = SUPER_CTRL_SHIFT, $left, moveworkspacetomonitor, e+0 +1
|
||||||
|
bind = SUPER_CTRL_SHIFT, $left, submap, reset
|
||||||
bind = SUPER_CTRL_SHIFT, $right, moveworkspacetomonitor, e+0 -1
|
bind = SUPER_CTRL_SHIFT, $right, moveworkspacetomonitor, e+0 -1
|
||||||
|
bind = SUPER_CTRL_SHIFT, $right, submap, reset
|
||||||
bind = SUPER, Tab, cyclenext,
|
bind = SUPER, Tab, cyclenext,
|
||||||
bind = SUPER_SHIFT, Tab, cyclenext, prev
|
bind = SUPER_SHIFT, Tab, cyclenext, prev
|
||||||
bindm = SUPER, mouse:272, movewindow
|
bindm = SUPER, mouse:272, movewindow
|
||||||
@@ -173,5 +271,17 @@ in {
|
|||||||
bind = SUPER_SHIFT, asterisk, movetoworkspace, 10
|
bind = SUPER_SHIFT, asterisk, movetoworkspace, 10
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
services = {
|
||||||
|
blueman-applet.enable = true;
|
||||||
|
hyprpaper = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
ipc = "on";
|
||||||
|
splash = false;
|
||||||
|
preload = "/home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
|
||||||
|
wallpaper = ", /home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.home.desktop.hyprpaper;
|
|
||||||
in {
|
|
||||||
options.home.desktop.hyprpaper = {
|
|
||||||
enable = mkEnableOption "Enables Hyprpaper";
|
|
||||||
default = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
|
|
||||||
example = "/home/user/image.jpg";
|
|
||||||
};
|
|
||||||
wallpapers-dir = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/home/phundrak/Pictures/Wallpapers/nord/";
|
|
||||||
example = "/home/user/Pictures/";
|
|
||||||
};
|
|
||||||
rotation-interval = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "5m";
|
|
||||||
example = "10m";
|
|
||||||
description = "Interval between wallpaper rotations";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
services.hyprpaper = {
|
|
||||||
inherit (cfg) enable;
|
|
||||||
settings = {
|
|
||||||
ipc = "on";
|
|
||||||
splash = false;
|
|
||||||
preload = cfg.default;
|
|
||||||
wallpaper = ", ${cfg.default}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systemd.user = {
|
|
||||||
services.hyprpaper-rotation = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Rotate Hyprpaper wallpaper";
|
|
||||||
After = "graphical-session.target";
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecCondition = "${pkgs.procps}/bin/pidof Hyprland";
|
|
||||||
ExecStart = "${config.home.homeDirectory}/.config/hypr/hyprpaper-rotate.sh";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
timers.hyprpaper-rotation = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Timer for rotating Hyprpaper wallpaper";
|
|
||||||
};
|
|
||||||
Timer = {
|
|
||||||
OnBootSec = cfg.rotation-interval;
|
|
||||||
OnUnitActiveSec = cfg.rotation-interval;
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = ["timers.target"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
home.file.".config/hypr/hyprpaper-rotate.sh" = {
|
|
||||||
text = ''
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
WALLPAPER_DIR="${cfg.wallpapers-dir}"
|
|
||||||
|
|
||||||
# Find a random wallpaper
|
|
||||||
WP=$(find "$WALLPAPER_DIR" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n 1)
|
|
||||||
|
|
||||||
if [ -z "$WP" ]; then
|
|
||||||
echo "No wallpapers found in $WALLPAPER_DIR"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Setting wallpaper to: $WP"
|
|
||||||
|
|
||||||
# Load and set the wallpaper
|
|
||||||
${pkgs.hyprland}/bin/hyprctl hyprpaper preload "$WP" && ${pkgs.hyprland}/bin/hyprctl hyprpaper wallpaper ",$WP"
|
|
||||||
'';
|
|
||||||
executable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,107 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.home.desktop.rofi;
|
|
||||||
inherit (config.lib.formats.rasi) mkLiteral;
|
|
||||||
in {
|
|
||||||
options.home.desktop.rofi = {
|
|
||||||
enable = mkEnableOption "Enable Rofi";
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
home.packages = with pkgs; [rofi-bluetooth];
|
|
||||||
programs.rofi = {
|
|
||||||
enable = true;
|
|
||||||
plugins = with pkgs; [
|
|
||||||
rofi-calc
|
|
||||||
rofi-emoji
|
|
||||||
];
|
|
||||||
terminal = "${pkgs.kitty}/bin/kitty";
|
|
||||||
location = "center";
|
|
||||||
modes = ["drun" "emoji" "calc" "combi"];
|
|
||||||
extraConfig.show-icons = true;
|
|
||||||
theme = {
|
|
||||||
"*" = {
|
|
||||||
font = "Cascadia Code 14";
|
|
||||||
blur = true;
|
|
||||||
padding = mkLiteral "10px";
|
|
||||||
background-color = mkLiteral "transparent";
|
|
||||||
border-radius = mkLiteral "0px";
|
|
||||||
};
|
|
||||||
window = {
|
|
||||||
width = mkLiteral "1050px";
|
|
||||||
height = mkLiteral "625px";
|
|
||||||
location = mkLiteral "center";
|
|
||||||
blur = true;
|
|
||||||
border = mkLiteral "2px";
|
|
||||||
border-radius = mkLiteral "3px";
|
|
||||||
border-color = mkLiteral "#61afef";
|
|
||||||
background-color = mkLiteral "transparent";
|
|
||||||
padding = mkLiteral "0px";
|
|
||||||
margin = mkLiteral "30px 50px";
|
|
||||||
};
|
|
||||||
mainbox = {
|
|
||||||
orientation = mkLiteral "horizontal";
|
|
||||||
children = map mkLiteral ["borderbox"];
|
|
||||||
spacing = mkLiteral "0px";
|
|
||||||
padding = mkLiteral "0px";
|
|
||||||
};
|
|
||||||
borderbox = {
|
|
||||||
orientation = mkLiteral "horizontal";
|
|
||||||
children = map mkLiteral ["imagebox" "contentbox"];
|
|
||||||
padding = mkLiteral "0px";
|
|
||||||
spacing = mkLiteral "0px";
|
|
||||||
border-radius = mkLiteral "3px";
|
|
||||||
};
|
|
||||||
contentbox = {
|
|
||||||
orientation = mkLiteral "vertical";
|
|
||||||
children = map mkLiteral ["entry" "listview"];
|
|
||||||
spacing = mkLiteral "0px";
|
|
||||||
padding = mkLiteral "0px";
|
|
||||||
expand = true;
|
|
||||||
};
|
|
||||||
imagebox = {
|
|
||||||
background-image = mkLiteral "url(\"${./image.jpg}\")";
|
|
||||||
background-repeat = false;
|
|
||||||
size = mkLiteral "200px 625px";
|
|
||||||
};
|
|
||||||
element = {
|
|
||||||
border-radius = mkLiteral "0px";
|
|
||||||
};
|
|
||||||
"element-text, element-icon" = {
|
|
||||||
padding = mkLiteral "6px 8px";
|
|
||||||
spacing = mkLiteral "2px";
|
|
||||||
text-color = mkLiteral "#fab387";
|
|
||||||
};
|
|
||||||
"element selected" = {
|
|
||||||
background-color = mkLiteral "#191919";
|
|
||||||
text-color = mkLiteral "#e5c07b";
|
|
||||||
border-radius = mkLiteral "3px";
|
|
||||||
};
|
|
||||||
prompt = {
|
|
||||||
enabled = false;
|
|
||||||
background-color = mkLiteral "transparent";
|
|
||||||
text-color = mkLiteral "#61afef";
|
|
||||||
padding = mkLiteral "5px 10px";
|
|
||||||
};
|
|
||||||
entry = {
|
|
||||||
padding = mkLiteral "8px";
|
|
||||||
expand = false;
|
|
||||||
font = "Cascadia Code 14";
|
|
||||||
text-color = mkLiteral "#fab387";
|
|
||||||
border-radius = mkLiteral "0px 3px 0px 0px";
|
|
||||||
background-color = mkLiteral "#292e36";
|
|
||||||
};
|
|
||||||
listview = {
|
|
||||||
lines = mkLiteral "1";
|
|
||||||
background-color = mkLiteral "rgba(46, 52, 64, 0.8)";
|
|
||||||
border-radius = mkLiteral "0px 0px 3px 0px";
|
|
||||||
padding = mkLiteral "5px";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 228 KiB |
@@ -1,189 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit
|
|
||||||
(lib)
|
|
||||||
literalExpression
|
|
||||||
mkIf
|
|
||||||
mkOption
|
|
||||||
mkEnableOption
|
|
||||||
types
|
|
||||||
;
|
|
||||||
cfg = config.home.desktop.wlr-which-key;
|
|
||||||
yamlFormat = pkgs.formats.yaml {};
|
|
||||||
|
|
||||||
# Convert kebab-case to snake_case
|
|
||||||
toSnakeCase = str: builtins.replaceStrings ["-"] ["_"] str;
|
|
||||||
|
|
||||||
# Recursively filter out null values and convert kebab-case keys to snake_case
|
|
||||||
filterNulls = value:
|
|
||||||
if lib.isAttrs value
|
|
||||||
then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (n: v: v != null) value)
|
|
||||||
else if lib.isList value
|
|
||||||
then map filterNulls value
|
|
||||||
else value;
|
|
||||||
menuEntryType = types.submodule {
|
|
||||||
freeformType = yamlFormat.type;
|
|
||||||
options = with types; {
|
|
||||||
key = mkOption {
|
|
||||||
type = str;
|
|
||||||
example = "p";
|
|
||||||
};
|
|
||||||
desc = mkOption {
|
|
||||||
type = str;
|
|
||||||
example = "Power";
|
|
||||||
};
|
|
||||||
cmd = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "echo example";
|
|
||||||
};
|
|
||||||
keep-open = mkOption {
|
|
||||||
type = nullOr bool;
|
|
||||||
default = null;
|
|
||||||
example = true;
|
|
||||||
};
|
|
||||||
submenu = mkOption {
|
|
||||||
type = nullOr (listOf menuEntryType);
|
|
||||||
default = null;
|
|
||||||
example = literalExpression ''
|
|
||||||
[
|
|
||||||
{ key = "s"; desc = "Suspend"; cmd = "systemctl suspend"; }
|
|
||||||
{ key = "r"; desc = "Reboot"; cmd = "systemctl reboot"; }
|
|
||||||
{ key = "o"; desc = "Poweroff"; cmd = "systemctl poweroff"; }
|
|
||||||
]
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
settingsType = types.submodule {
|
|
||||||
freeformType = yamlFormat.type;
|
|
||||||
options = with types; {
|
|
||||||
background = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "#282828FF";
|
|
||||||
};
|
|
||||||
color = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "#FBF1C7FF";
|
|
||||||
};
|
|
||||||
border = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "#8EC07CFF";
|
|
||||||
};
|
|
||||||
anchor = mkOption {
|
|
||||||
type = nullOr (enum ["center" "top" "bottom" "left" "right" "top-left" "top-right" "bottom-left" "bottom-right"]);
|
|
||||||
default = null;
|
|
||||||
example = "top-left";
|
|
||||||
};
|
|
||||||
margin-top = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
example = "0";
|
|
||||||
};
|
|
||||||
margin-right = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
example = "0";
|
|
||||||
};
|
|
||||||
margin-bottom = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
example = "0";
|
|
||||||
};
|
|
||||||
margin-left = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
example = "0";
|
|
||||||
};
|
|
||||||
font = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "monospace 10";
|
|
||||||
};
|
|
||||||
separator = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = " ➜ ";
|
|
||||||
};
|
|
||||||
border-width = mkOption {
|
|
||||||
type = nullOr (either float int);
|
|
||||||
default = null;
|
|
||||||
example = 4.0;
|
|
||||||
};
|
|
||||||
corder-r = mkOption {
|
|
||||||
type = nullOr (either float int);
|
|
||||||
default = null;
|
|
||||||
example = 20.0;
|
|
||||||
};
|
|
||||||
padding = mkOption {
|
|
||||||
type = nullOr (either float int);
|
|
||||||
default = null;
|
|
||||||
example = 15.0;
|
|
||||||
};
|
|
||||||
rows-per-column = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
example = 5;
|
|
||||||
};
|
|
||||||
column-padding = mkOption {
|
|
||||||
type = nullOr (either float int);
|
|
||||||
default = null;
|
|
||||||
example = 25.0;
|
|
||||||
};
|
|
||||||
inhibit-compositor-keyboard-shortcuts = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
example = false;
|
|
||||||
};
|
|
||||||
auto_kbd_layout = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
example = false;
|
|
||||||
};
|
|
||||||
namespace = mkOption {
|
|
||||||
type = nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "wlr_which_key";
|
|
||||||
};
|
|
||||||
menu = mkOption {
|
|
||||||
type = listOf menuEntryType;
|
|
||||||
default = [];
|
|
||||||
example = literalExpression ''
|
|
||||||
[
|
|
||||||
{
|
|
||||||
key = "p";
|
|
||||||
desc = "Power";
|
|
||||||
submenu = [
|
|
||||||
{ key = "s"; desc = "Suspend"; cmd = "systemctl suspend"; }
|
|
||||||
{ key = "r"; desc = "Reboot"; cmd = "systemctl reboot"; }
|
|
||||||
{ key = "o"; desc = "Poweroff"; cmd = "systemctl poweroff"; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
]
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options.home.desktop.wlr-which-key = {
|
|
||||||
enable = mkEnableOption "Enables wlr-which-key";
|
|
||||||
package = lib.mkPackageOption pkgs "wlr-which-key" {};
|
|
||||||
settings = mkOption {
|
|
||||||
type = settingsType;
|
|
||||||
default = {};
|
|
||||||
description = "Configuration written to {file}`$XDG_CONFIG_HOME/wlr-which-key/config.yaml`.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
xdg.configFile = {
|
|
||||||
"wlr-which-key/config.yaml".source = yamlFormat.generate "wlr-which-key-config.yml" (filterNulls cfg.settings);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
76
users/modules/desktop/wofi.nix
Normal file
76
users/modules/desktop/wofi.nix
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.home.desktop.wofi;
|
||||||
|
in {
|
||||||
|
options.home.desktop.wofi.enable = mkEnableOption "Enable wofi support";
|
||||||
|
config.programs.wofi = mkIf cfg.enable {
|
||||||
|
inherit (cfg) enable;
|
||||||
|
settings = {
|
||||||
|
modi = "ssh,drun,combi";
|
||||||
|
sidebar-mode = false;
|
||||||
|
width = 50;
|
||||||
|
line-margin = 10;
|
||||||
|
lines = 6;
|
||||||
|
columns = 2;
|
||||||
|
display-ssh = "";
|
||||||
|
display-run = "";
|
||||||
|
display-drun = "";
|
||||||
|
display-window = "";
|
||||||
|
display-combi = "";
|
||||||
|
show-icons = true;
|
||||||
|
};
|
||||||
|
# from https://github.com/alxndr13/wofi-nord-theme
|
||||||
|
style = ''
|
||||||
|
* {
|
||||||
|
font-family: "Hack", monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
window {
|
||||||
|
background-color: #3B4252;
|
||||||
|
}
|
||||||
|
|
||||||
|
#input {
|
||||||
|
margin: 5px;
|
||||||
|
border-radius: 0px;
|
||||||
|
border: none;
|
||||||
|
background-color: #3B4252;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
#inner-box {
|
||||||
|
background-color: #383C4A;
|
||||||
|
}
|
||||||
|
|
||||||
|
#outer-box {
|
||||||
|
margin: 2px;
|
||||||
|
padding: 10px;
|
||||||
|
background-color: #383C4A;
|
||||||
|
}
|
||||||
|
|
||||||
|
#scroll {
|
||||||
|
margin: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#text {
|
||||||
|
padding: 4px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
#entry:nth-child(even){
|
||||||
|
background-color: #404552;
|
||||||
|
}
|
||||||
|
|
||||||
|
#entry:selected {
|
||||||
|
background-color: #4C566A;
|
||||||
|
}
|
||||||
|
|
||||||
|
#text:selected {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -16,17 +16,11 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config.services.ollama = mkIf cfg.enable {
|
||||||
services.ollama = mkIf cfg.enable {
|
|
||||||
inherit (cfg) enable;
|
inherit (cfg) enable;
|
||||||
acceleration = cfg.gpu;
|
acceleration = cfg.gpu;
|
||||||
host = "0.0.0.0";
|
|
||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
OLLAMA_CONTEXT_LENGTH = "8192";
|
OLLAMA_CONTEXT_LENGTH = "8192";
|
||||||
OLLAMA_MAX_LOADED_MODELS = "1";
|
|
||||||
OLLAMA_KEEP_ALIVE = "10m";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home.sessionVariables.OLLAMA_API_BASE = "http://${config.services.ollama.host}:11434/";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,9 @@
|
|||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
|
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
|
||||||
epkgs:
|
epkgs: [
|
||||||
with epkgs; [
|
epkgs.mu4e
|
||||||
mu4e
|
epkgs.pdf-tools
|
||||||
pdf-tools
|
|
||||||
]
|
]
|
||||||
));
|
));
|
||||||
cfg = config.home.dev.editors.emacs;
|
cfg = config.home.dev.editors.emacs;
|
||||||
@@ -26,10 +25,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
home.packages = with pkgs; [
|
home.packages = [pkgs.emacs-all-the-icons-fonts];
|
||||||
emacs-all-the-icons-fonts
|
|
||||||
emacs-lsp-booster
|
|
||||||
];
|
|
||||||
programs.emacs = mkIf cfg.enable {
|
programs.emacs = mkIf cfg.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit (cfg) package;
|
inherit (cfg) package;
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ in {
|
|||||||
sshKey = mkOption {
|
sshKey = mkOption {
|
||||||
type = with types; nullOr (either path str);
|
type = with types; nullOr (either path str);
|
||||||
example = "~/.ssh/id_ed25519.pub";
|
example = "~/.ssh/id_ed25519.pub";
|
||||||
default = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
default = "~/.ssh/id_ed25519.pub";
|
||||||
description = "Path to the private SSH key for signing.";
|
description = "Path to the public SSH key or its content.";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -54,8 +54,8 @@ in {
|
|||||||
behavior = "own";
|
behavior = "own";
|
||||||
backend = "ssh";
|
backend = "ssh";
|
||||||
key = cfg.signing.sshKey;
|
key = cfg.signing.sshKey;
|
||||||
backends.ssh.allowed-signers = "${config.home.homeDirectory}/.ssh/allowed_signers";
|
backends."ssh.allowed-signers" = "~/.ssh/allowed_signers";
|
||||||
backends.ssh.program = "${pkgs.openssh}/bin/ssh-keygen";
|
backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen";
|
||||||
};
|
};
|
||||||
aliases = {
|
aliases = {
|
||||||
blame = ["file" "annotate"];
|
blame = ["file" "annotate"];
|
||||||
|
|||||||
@@ -40,16 +40,6 @@ with lib; let
|
|||||||
dcud = "docker compose up -d";
|
dcud = "docker compose up -d";
|
||||||
dcudp = "docker compose up -d --pull=always";
|
dcudp = "docker compose up -d --pull=always";
|
||||||
dcr = "docker compose restart";
|
dcr = "docker compose restart";
|
||||||
pc = "podman compose";
|
|
||||||
pcd = "podman compose down";
|
|
||||||
pcl = "podman compose logs";
|
|
||||||
pclf = "podman compose logs -f";
|
|
||||||
pcp = "podman compose pull";
|
|
||||||
pcu = "podman compose up";
|
|
||||||
pcud = "podman compose up -d";
|
|
||||||
pcudp = "podman compose up -d --pull=always";
|
|
||||||
pcr = "podman compose restart";
|
|
||||||
|
|
||||||
enw = "emacsclient -nw";
|
enw = "emacsclient -nw";
|
||||||
e = "emacsclient -n -c";
|
e = "emacsclient -n -c";
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
// "width": 1280, // Waybar width
|
// "width": 1280, // Waybar width
|
||||||
"spacing": 2, // Gaps between modules (4px)
|
"spacing": 2, // Gaps between modules (4px)
|
||||||
// Choose the order of the modules
|
// Choose the order of the modules
|
||||||
"modules-left": ["hyprland/workspaces", "hyprland/language", "hyprland/submap", "hyprland/window"],
|
"modules-left": ["hyprland/workspaces", "hyprland/submap", "hyprland/window"],
|
||||||
"modules-center": [],
|
"modules-center": [],
|
||||||
"modules-right": ["idle_inhibitor", "mpd", "pulseaudio", "network", "cpu",
|
"modules-right": ["idle_inhibitor", "mpd", "pulseaudio", "network", "cpu",
|
||||||
"memory", "temperature", "battery", "clock", "tray"],
|
"memory", "temperature", "battery", "clock", "tray"],
|
||||||
@@ -35,11 +35,15 @@
|
|||||||
"unlocked": ""
|
"unlocked": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
"sway/mode": {
|
||||||
"hyprland/language": {
|
"format": "<span style=\"italic\">{}</span>"
|
||||||
"format": "Lang: {}",
|
},
|
||||||
"format-en": "gaming",
|
"sway/scratchpad": {
|
||||||
},
|
"format": "{icon} {count}",
|
||||||
|
"show-empty": false,
|
||||||
|
"format-icons": ["", ""],
|
||||||
|
"tooltip": true,
|
||||||
|
"tooltip-format": "{app}: {title}"
|
||||||
},
|
},
|
||||||
"mpd": {
|
"mpd": {
|
||||||
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
|
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
Sent from GNU/Emacs
|
Sent from GNU/Emacs
|
||||||
|
|
||||||
@@@ Sauvez un arbre, mangez un castor @@@
|
*** Sauvez un arbre, mangez un castor ***
|
||||||
@@@ Save a tree, eat a beaver @@@
|
*** Save a tree, eat a beaver ***
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
home.file.".signature" = {
|
home.file.".signature" = {
|
||||||
|
|||||||
@@ -1,48 +1,20 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./light-home.nix
|
./light-home.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./email.nix
|
./email.nix
|
||||||
./wlr-which-key
|
|
||||||
../modules
|
../modules
|
||||||
];
|
];
|
||||||
|
|
||||||
config = let
|
config = let
|
||||||
emacsPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
|
emacsPkg = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
|
||||||
epkgs:
|
epkgs: [
|
||||||
with epkgs; [
|
epkgs.mu4e
|
||||||
mu4e
|
epkgs.pdf-tools
|
||||||
pdf-tools
|
|
||||||
tree-sitter
|
|
||||||
tree-sitter-langs
|
|
||||||
(treesit-grammars.with-grammars (grammar:
|
|
||||||
with grammar; [
|
|
||||||
tree-sitter-bash
|
|
||||||
tree-sitter-c
|
|
||||||
tree-sitter-cpp
|
|
||||||
tree-sitter-css
|
|
||||||
tree-sitter-dockerfile
|
|
||||||
tree-sitter-http
|
|
||||||
tree-sitter-javascript
|
|
||||||
tree-sitter-jsdoc
|
|
||||||
tree-sitter-json
|
|
||||||
tree-sitter-just
|
|
||||||
tree-sitter-markdown
|
|
||||||
tree-sitter-markdown-inline
|
|
||||||
tree-sitter-nix
|
|
||||||
tree-sitter-rust
|
|
||||||
tree-sitter-sql
|
|
||||||
tree-sitter-toml
|
|
||||||
tree-sitter-typescript
|
|
||||||
tree-sitter-typst
|
|
||||||
tree-sitter-vue
|
|
||||||
tree-sitter-yaml
|
|
||||||
]))
|
|
||||||
]
|
]
|
||||||
));
|
));
|
||||||
askpass = import ../modules/cli/scripts/askpass.nix {inherit pkgs;};
|
askpass = import ../modules/cli/scripts/askpass.nix {inherit pkgs;};
|
||||||
@@ -58,35 +30,18 @@
|
|||||||
|
|
||||||
home = {
|
home = {
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -a ${config.home.dev.editors.emacs.package}/bin/emacs";
|
EDITOR = "${emacsPkg}/bin/emacsclient -c -a ${emacsPkg}/bin/emacs";
|
||||||
LAUNCH_EDITOR = "${launchWithEmacsclient}/bin/launch-with-emacsclient";
|
LAUNCH_EDITOR = "${launchWithEmacsclient}/bin/launch-with-emacsclient";
|
||||||
SUDO_ASKPASS = "${askpass}/bin/askpass";
|
SUDO_ASKPASS = "${askpass}/bin/askpass";
|
||||||
LSP_USE_PLISTS = "true";
|
LSP_USE_PLISTS = "true";
|
||||||
OPENAI_API_URL = "http://localhost:1234/";
|
|
||||||
};
|
|
||||||
desktop.waybar.style = ./config/waybar/style.css;
|
|
||||||
dev = {
|
|
||||||
ai.claude.enable = true;
|
|
||||||
editors.emacs.package = emacsPackage;
|
|
||||||
vcs.jj.signing.enable = true;
|
|
||||||
};
|
|
||||||
fullDesktop = true;
|
|
||||||
file."${config.home.homeDirectory}/.ssh/allowed_signers" = {
|
|
||||||
enable = true;
|
|
||||||
text = lib.strings.join "\n" (
|
|
||||||
map (file: let
|
|
||||||
content = lib.strings.trim (builtins.readFile file);
|
|
||||||
parts = lib.strings.splitString " " content;
|
|
||||||
email = lib.lists.last parts;
|
|
||||||
in "${email} namespaces=\"git\" ${content}")
|
|
||||||
(lib.filesystem.listFilesRecursive ../../keys)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
manual = {
|
desktop.waybar.style = ./config/waybar/style.css;
|
||||||
html.enable = true;
|
dev.ai.claude.enable = true;
|
||||||
manpages.enable = true;
|
fullDesktop = true;
|
||||||
|
shell.fish.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
manual.html.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,22 +68,18 @@ with lib; {
|
|||||||
gimpPlugins.gmic
|
gimpPlugins.gmic
|
||||||
|
|
||||||
# Dev
|
# Dev
|
||||||
dbeaver-bin
|
|
||||||
devenv
|
devenv
|
||||||
nodejs
|
dive # A tool for exploring each layer in a docker image
|
||||||
sqlite
|
grype # Vulnerability scanner for container images and filesystems
|
||||||
tectonic # better LaTeX engine
|
tectonic # better LaTeX engine
|
||||||
wakatime-cli
|
|
||||||
zeal
|
zeal
|
||||||
|
|
||||||
## LSP servers
|
## LSP servers
|
||||||
bash-language-server
|
bash-language-server
|
||||||
docker-language-server
|
docker-language-server
|
||||||
kdePackages.qtdeclarative # For QML LSP
|
kdePackages.qtdeclarative # For QML LSP
|
||||||
nixd
|
nil # Nix
|
||||||
marksman
|
|
||||||
python3 # for Emacs and LSP
|
python3 # for Emacs and LSP
|
||||||
vscode-json-languageserver
|
|
||||||
yaml-language-server # Yaml (Docker, GitHub Actions, ...)
|
yaml-language-server # Yaml (Docker, GitHub Actions, ...)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "center-window" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch centerwindow
|
|
||||||
''
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "close-window" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch killactive
|
|
||||||
''
|
|
||||||
@@ -1,232 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
config.home.desktop.wlr-which-key.settings = {
|
|
||||||
font = "Cascadia Code 12";
|
|
||||||
background = "#3b4252d0";
|
|
||||||
color = "#eceff4";
|
|
||||||
border = "#2e3440";
|
|
||||||
border_width = 2;
|
|
||||||
corner_r = 10;
|
|
||||||
rows_per_column = 5;
|
|
||||||
column_padding = 25;
|
|
||||||
inhibit_compositor_keyboard_shortcuts = true;
|
|
||||||
auto_kbd_layout = true;
|
|
||||||
menu = let
|
|
||||||
left = "c";
|
|
||||||
down = "t";
|
|
||||||
up = "s";
|
|
||||||
right = "r";
|
|
||||||
center-window = import ./center-window.nix {inherit pkgs;};
|
|
||||||
close-window = import ./close-window.nix {inherit pkgs;};
|
|
||||||
float-window = import ./float-window.nix {inherit pkgs;};
|
|
||||||
focus-urgent = import ./focus-urgent.nix {inherit pkgs;};
|
|
||||||
fullscreen = import ./fullscreen.nix {inherit pkgs;};
|
|
||||||
logout = import ./logout.nix {inherit pkgs;};
|
|
||||||
ytplay = import ../../modules/cli/scripts/ytplay.nix {inherit pkgs;};
|
|
||||||
in [
|
|
||||||
{
|
|
||||||
key = "a";
|
|
||||||
desc = "Apps";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = "b";
|
|
||||||
desc = "Browser";
|
|
||||||
cmd = "zen";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "B";
|
|
||||||
desc = "Qutebrowser";
|
|
||||||
cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "d";
|
|
||||||
desc = "Discord";
|
|
||||||
cmd = "${pkgs.vesktop}/bin/vesktop";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "e";
|
|
||||||
desc = "Emacs";
|
|
||||||
cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "g";
|
|
||||||
desc = "Gimp";
|
|
||||||
cmd = "${pkgs.gimp}/bin/gimp";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "n";
|
|
||||||
desc = "Nemo";
|
|
||||||
cmd = "${pkgs.nemo-with-extensions}/bin/nemo";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "N";
|
|
||||||
desc = "Nextcloud";
|
|
||||||
cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "r";
|
|
||||||
desc = "Rofi";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = "b";
|
|
||||||
desc = "Bluetooth";
|
|
||||||
cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "c";
|
|
||||||
desc = "calc";
|
|
||||||
cmd = "rofi -show calc";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "e";
|
|
||||||
desc = "Emoji";
|
|
||||||
cmd = "rofi -show emoji";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "r";
|
|
||||||
desc = "App Menu";
|
|
||||||
cmd = "rofi -show drun";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "s";
|
|
||||||
desc = "SSH";
|
|
||||||
cmd = "rofi -show ssh";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "y";
|
|
||||||
desc = "YouTube";
|
|
||||||
cmd = "${ytplay}/bin/ytplay";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "b";
|
|
||||||
desc = "Buffers";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = "c";
|
|
||||||
desc = "Center";
|
|
||||||
cmd = "${center-window}/bin/center-window";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "d";
|
|
||||||
desc = "Close";
|
|
||||||
cmd = "${close-window}/bin/close-window";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "f";
|
|
||||||
desc = "Fullscreen";
|
|
||||||
cmd = "${fullscreen}/bin/fullscreen";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "F";
|
|
||||||
desc = "Float";
|
|
||||||
cmd = "${float-window}/bin/float-window";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "u";
|
|
||||||
desc = "Urgent";
|
|
||||||
cmd = "${focus-urgent}/bin/focus-urgent";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = ".";
|
|
||||||
desc = "Resize";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = left;
|
|
||||||
desc = "Decrease Width";
|
|
||||||
cmd = "echo decrease width";
|
|
||||||
keep-open = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = down;
|
|
||||||
desc = "Increase Height";
|
|
||||||
cmd = "echo decrease height";
|
|
||||||
keep-open = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = up;
|
|
||||||
desc = "Decrease Height";
|
|
||||||
cmd = "echo decrease height";
|
|
||||||
keep-open = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = right;
|
|
||||||
desc = "Increase Width";
|
|
||||||
cmd = "echo increase width";
|
|
||||||
keep-open = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "p";
|
|
||||||
desc = "Power";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = "l";
|
|
||||||
desc = "Logout";
|
|
||||||
cmd = "";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "s";
|
|
||||||
desc = "Suspend";
|
|
||||||
cmd = "systemctl suspend";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "r";
|
|
||||||
desc = "Reboot";
|
|
||||||
cmd = "systemctl reboot";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "o";
|
|
||||||
desc = "Poweroff";
|
|
||||||
cmd = "systemctl poweroff";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "s";
|
|
||||||
desc = "Screenshots";
|
|
||||||
submenu = [
|
|
||||||
{
|
|
||||||
key = "Print";
|
|
||||||
desc = "Screenshot";
|
|
||||||
cmd = "screenshot";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "d";
|
|
||||||
desc = "Delayed";
|
|
||||||
cmd = "screenshot -d 3";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "D";
|
|
||||||
desc = "Select, Delay, Edit, and Copy";
|
|
||||||
cmd = "screenshot -secd 3";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "e";
|
|
||||||
desc = "Select, Edit, and Copy";
|
|
||||||
cmd = "screenshot -sec";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "g";
|
|
||||||
desc = "Select, Gimp, and Copy";
|
|
||||||
cmd = "screenshot -sgc";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "s";
|
|
||||||
desc = "Select and Copy";
|
|
||||||
cmd = "screenshot -sc";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "float" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating
|
|
||||||
''
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "focus-urgent" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch focusurgentorlast
|
|
||||||
''
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "fullscreen" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch fullscreen
|
|
||||||
''
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
{pkgs, ...}:
|
|
||||||
pkgs.writeShellScriptBin "logout" ''
|
|
||||||
${pkgs.procps}/bin/pidof -x Hyprland && uwsm stop
|
|
||||||
''
|
|
||||||
Reference in New Issue
Block a user