nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: bump

Browse source
This commit is contained in:
Guanran Wang 2024-09-16 01:20:38 +08:00
parent 5f8f3eb171
commit 648918ee26
Signed by: nyancat
GPG key ID: 91F97D9ED12639CF
9 changed files with 45 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.sops.yaml
View file

@ -1,29 +1,27 @@
keys: keys:
# Users
- &guanranwang age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq - &guanranwang age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
# Hosts # ssh-to-age < /etc/ssh/ssh_host_ed25519_key.pub
# nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age'
- &blacksteel age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
- &dust age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl - &dust age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
- &lightsail-tokyo age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa - &pek0 age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
- &tyo0 age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
creation_rules: creation_rules:
- path_regex: hosts/blacksteel/secrets.yaml$ - path_regex: hosts/pek0/secrets.yaml$
key_groups: key_groups:
- age: - age:
- *guanranwang - *guanranwang
- *blacksteel - *pek0
- path_regex: hosts/tyo0/secrets.yaml$ - path_regex: hosts/tyo0/secrets.yaml$
key_groups: key_groups:
- age: - age:
- *guanranwang - *guanranwang
- *lightsail-tokyo - *tyo0
- path_regex: nixos/profiles/sing-box/secrets.yaml$ - path_regex: nixos/profiles/sing-box/secrets.yaml$
key_groups: key_groups:
- age: - age:
- *guanranwang - *guanranwang
- *blacksteel
- *dust - *dust
- *pek0
- path_regex: nixos/profiles/wireless/secrets.yaml$ - path_regex: nixos/profiles/wireless/secrets.yaml$
key_groups: key_groups:
- age: - age:
@ -33,6 +31,6 @@ creation_rules:
key_groups: key_groups:
- age: - age:
- *guanranwang - *guanranwang
- *blacksteel
- *dust - *dust
- *lightsail-tokyo - *pek0
- *tyo0

50
flake.lock
View file

@ -51,11 +51,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725377834, "lastModified": 1726396892,
"narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1726153070,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725180166, "lastModified": 1726357542,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725050929, "lastModified": 1726316254,
"narHash": "sha256-1z8i5qQwb28YM4cg1ji6b8f/5XDO30FIr/vObDRZbes=", "narHash": "sha256-82snaLYq0U2Wt5Vy+gFUmOTrjKEHOhm0uqaT6ycLKXc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d3b42cf643d03d675d19ec6259bb33538eaa706e", "rev": "2c3b306495070c8b20a1f28f9f7143917bbff9e6",
"revCount": 73, "revCount": 78,
"type": "git", "type": "git",
"url": "https://git.ny4.dev/nyancat/nvim" "url": "https://git.ny4.dev/nyancat/nvim"
}, },
@ -225,11 +225,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725477728, "lastModified": 1725885300,
"narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +240,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725534445, "lastModified": 1726365531,
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "narHash": "sha256-luAKNxWZ+ZN0kaHchx1OdLQ71n81Y31ryNPWP1YRDZc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "rev": "9299cdf978e15f448cf82667b0ffdd480b44ee48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +327,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725589472, "lastModified": 1726382494,
"narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725540166, "lastModified": 1726218807,
"narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
home/applications/neovim/default.nix
View file

@ -4,12 +4,7 @@
... ...
}: }:
{ {
home.packages = [ home.packages = [ pkgs.neovim ];
(inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
viAlias = true;
vimAlias = true;
})
];
home.sessionVariables."EDITOR" = "nvim"; home.sessionVariables."EDITOR" = "nvim";
xdg.configFile."nvim".source = inputs.neovim;
} }

8
home/applications/sway/default.nix
View file

@ -6,19 +6,11 @@
... ...
}: }:
{ {
home.packages = with pkgs; [
wl-clipboard
pwvucontrol
];
# remove csd window buttons # remove csd window buttons
# https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45 # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
home.sessionVariables.GTK_CSD = 0; home.sessionVariables.GTK_CSD = 0;
dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "appmenu:"; dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "appmenu:";
services.cliphist.enable = true;
services.udiskie.enable = true;
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
checkConfig = false; # wtf? checkConfig = false; # wtf?

7
home/default.nix
View file

@ -23,6 +23,11 @@
zoxide.enable = true; zoxide.enable = true;
}; };
services = {
cliphist.enable = true;
udiskie.enable = true;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
dconf-editor dconf-editor
fastfetch fastfetch
@ -32,6 +37,8 @@
gnome-calculator gnome-calculator
hyperfine hyperfine
loupe loupe
pwvucontrol
seahorse seahorse
wl-clipboard
]; ];
} }

1
home/theme.nix
View file

@ -17,6 +17,7 @@
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk3.bookmarks = [ gtk3.bookmarks = [
"smb://blacksteel/external"
"file://${config.home.homeDirectory}/Documents/Projects/flake" "file://${config.home.homeDirectory}/Documents/Projects/flake"
]; ];

2
home/xdg-mime.nix
View file

@ -22,7 +22,7 @@
"audio/mpeg" "audio/mpeg"
"audio/ogg" "audio/ogg"
"audio/wav" "audio/wav"
] (_n: [ "io.bassi.Amberol.desktop" ]) ] (_n: [ "mpv.desktop" ])
### Image viewer ### Image viewer
// lib.genAttrs [ // lib.genAttrs [
"image/gif" "image/gif"

1
hosts/pek0/anti-feature.nix
View file

@ -5,7 +5,6 @@
allowNonSourcePredicate = allowNonSourcePredicate =
pkg: pkg:
lib.elem (lib.getName pkg) [ lib.elem (lib.getName pkg) [
"adoptopenjdk-hotspot-bin"
"cargo-bootstrap" "cargo-bootstrap"
"go" "go"
"minecraft-server" "minecraft-server"

1
hosts/tyo0/anti-feature.nix
View file

@ -5,7 +5,6 @@
allowNonSourcePredicate = allowNonSourcePredicate =
pkg: pkg:
lib.elem (lib.getName pkg) [ lib.elem (lib.getName pkg) [
"adoptopenjdk-hotspot-bin"
"cargo-bootstrap" "cargo-bootstrap"
"go" "go"
"keycloak" "keycloak"