Update flakes
This commit is contained in:
parent
7e2ae203da
commit
5c15c6885d
75
flake.lock
75
flake.lock
@ -77,11 +77,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752093218,
|
"lastModified": 1762704774,
|
||||||
"narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=",
|
"narHash": "sha256-iodz4xQbULkHqetbPu5BCSWsVEzZiiNSv0/dzfH4XiE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "206ed3c71418b52e176f16f58805c96e84555320",
|
"rev": "be4a9233dd3f6104c9b0fdd3d56f953eb519a4c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -98,14 +98,15 @@
|
|||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems"
|
"systems": "systems",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742156590,
|
"lastModified": 1756057867,
|
||||||
"narHash": "sha256-aTM/2CrNN5utdVEQGsOA+kl4UozgH7VPLBQL5OXtBrg=",
|
"narHash": "sha256-ziR5eQGqRWhW8tf8r0TIplaqNt+HXu1G1X41LUr4IYo=",
|
||||||
"owner": "hraban",
|
"owner": "hraban",
|
||||||
"repo": "mac-app-util",
|
"repo": "mac-app-util",
|
||||||
"rev": "341ede93f290df7957047682482c298e47291b4d",
|
"rev": "8414fa1e2cb775b17793104a9095aabeeada63ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -121,11 +122,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751313918,
|
"lastModified": 1762627886,
|
||||||
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
"narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
"rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -142,11 +143,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752054764,
|
"lastModified": 1762090880,
|
||||||
"narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
|
"narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixGL",
|
"repo": "nixGL",
|
||||||
"rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
|
"rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -157,11 +158,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751949589,
|
"lastModified": 1754340878,
|
||||||
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
|
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1762482733,
|
||||||
|
"narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9b008d60392981ad674e04016d25619281550a9d",
|
"rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -181,11 +198,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748196248,
|
"lastModified": 1762274591,
|
||||||
"narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
|
"narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "b7697abe89967839b273a863a3805345ea54ab56",
|
"rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -200,7 +217,7 @@
|
|||||||
"mac-app-util": "mac-app-util",
|
"mac-app-util": "mac-app-util",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixgl": "nixgl",
|
"nixgl": "nixgl",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"plasma-manager": "plasma-manager"
|
"plasma-manager": "plasma-manager"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -233,6 +250,24 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1755934250,
|
||||||
|
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@ -81,7 +81,7 @@
|
|||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
inputs.plasma-manager.homeModules.plasma-manager
|
||||||
./home-manager/common.nix
|
./home-manager/common.nix
|
||||||
./home-manager/becky-dingleberry.nix
|
./home-manager/becky-dingleberry.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@ -54,8 +54,8 @@ in
|
|||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
nixGL.packages = pkgs.nixgl;
|
targets.genericLinux.nixGL.packages = pkgs.nixgl;
|
||||||
nixGL.defaultWrapper = "nvidia";
|
targets.genericLinux.nixGL.defaultWrapper = "nvidia";
|
||||||
|
|
||||||
home.username = username;
|
home.username = username;
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ in
|
|||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
android-tools
|
android-tools
|
||||||
android-udev-rules
|
kdePackages.kdeconnect-kde
|
||||||
# TODO: Move from system to nix
|
# TODO: Move from system to nix
|
||||||
# awscli2
|
# awscli2
|
||||||
# kubectl
|
# kubectl
|
||||||
@ -73,6 +73,16 @@ in
|
|||||||
tcpdump
|
tcpdump
|
||||||
];
|
];
|
||||||
|
|
||||||
|
home.file = {
|
||||||
|
"${homedir}/.gnupg/gpg-agent.conf" = {
|
||||||
|
text = ''
|
||||||
|
default-cache-ttl 34560000
|
||||||
|
max-cache-ttl 34560000
|
||||||
|
pinentry-program ${pkgs.pinentry-curses}/bin/pinentry
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
xdg.configFile = lib.mkMerge [
|
xdg.configFile = lib.mkMerge [
|
||||||
{
|
{
|
||||||
"ghostty/config" = {
|
"ghostty/config" = {
|
||||||
@ -89,7 +99,7 @@ in
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: Manual ghostty injection
|
# TODO: Manual ghostty injectionF
|
||||||
programs.bat.syntaxes.ghostty = {
|
programs.bat.syntaxes.ghostty = {
|
||||||
src = pkgs.ghostty;
|
src = pkgs.ghostty;
|
||||||
file = "share/bat/syntaxes/ghostty.sublime-syntax";
|
file = "share/bat/syntaxes/ghostty.sublime-syntax";
|
||||||
@ -99,15 +109,11 @@ in
|
|||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Arnie";
|
settings = {
|
||||||
userEmail = "i@cechis.cz";
|
user = {
|
||||||
ignores = [
|
name = "Arnie";
|
||||||
".vscode"
|
email = "i@cechis.cz";
|
||||||
".direnv"
|
};
|
||||||
".devenv"
|
|
||||||
".envrc"
|
|
||||||
];
|
|
||||||
extraConfig = {
|
|
||||||
core = {
|
core = {
|
||||||
autocrlf = "input";
|
autocrlf = "input";
|
||||||
# TODO: Provide through nix
|
# TODO: Provide through nix
|
||||||
@ -119,6 +125,36 @@ in
|
|||||||
|
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ignores = [
|
||||||
|
".vscode"
|
||||||
|
".direnv"
|
||||||
|
".devenv"
|
||||||
|
".envrc"
|
||||||
|
];
|
||||||
|
|
||||||
|
signing = {
|
||||||
|
signByDefault = true;
|
||||||
|
key = "892F43F4";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Generate key wth gpg --full-gen-key
|
||||||
|
# Kind of key: 10 ECC sign only, curve 25519
|
||||||
|
# Real name: <username>
|
||||||
|
# Email address: <email>
|
||||||
|
|
||||||
|
# Add to git: gpg --list-secret-keys --keyid-format SHORT
|
||||||
|
# get the bit after the key kind and put it in the signing.key in git config above
|
||||||
|
# gpg --armor --export <KEY> and add to git account
|
||||||
|
|
||||||
|
programs.gpg = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
use-agent = true;
|
||||||
|
};
|
||||||
|
mutableKeys = false;
|
||||||
|
publicKeys = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Can't use the nixgl wrapper due to GTK libraries
|
# Can't use the nixgl wrapper due to GTK libraries
|
||||||
@ -217,6 +253,19 @@ in
|
|||||||
"Switch One Desktop to the Left" = "none";
|
"Switch One Desktop to the Left" = "none";
|
||||||
|
|
||||||
"Edit Tiles" = "none";
|
"Edit Tiles" = "none";
|
||||||
|
|
||||||
|
# "MoveMouseToCenter" = "Meta+F6,Meta+F6,Move Mouse to Center";
|
||||||
|
"MoveMouseToCenter" = "none";
|
||||||
|
# "MoveMouseToFocus" = "Meta+F5,Meta+F5,Move Mouse to Focus";
|
||||||
|
"MoveMouseToFocus" = "none";
|
||||||
|
|
||||||
|
# "Switch to Screen 0" = "none,,Switch to Screen 0";
|
||||||
|
"Switch to Screen 0" = "Meta+Ctrl+Alt+0";
|
||||||
|
# "Switch to Screen 1" = "none,,Switch to Screen 1";
|
||||||
|
"Switch to Screen 1" = "Meta+Ctrl+Alt+1";
|
||||||
|
# "Switch to Screen 2" = "none,,Switch to Screen 2";
|
||||||
|
"Switch to Screen 2" = "Meta+Ctrl+Alt+2";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
plasmashell = {
|
plasmashell = {
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
echo "Commands:"
|
echo "Commands:"
|
||||||
echo -n '${
|
echo -n '${
|
||||||
builtins.toJSON (
|
builtins.toJSON (
|
||||||
builtins.mapAttrs (s: value: value.description) self.devShells.${pkgs.system}.default.config.scripts
|
builtins.mapAttrs (s: value: value.description) self.devShells.${pkgs.stdenv.hostPlatform.system}.default.config.scripts
|
||||||
)
|
)
|
||||||
}' | \
|
}' | \
|
||||||
${pkgs.jq}/bin/jq -r 'to_entries | map(" \(.key)\n" + " - \(if .value == "" then "no description provided" else .value end)") | "" + .[]'
|
${pkgs.jq}/bin/jq -r 'to_entries | map(" \(.key)\n" + " - \(if .value == "" then "no description provided" else .value end)") | "" + .[]'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user