Compare commits
No commits in common. "be96257cd6e8c8e6073b2b69c17cbc0b5ca6587a" and "5f8f3eb171428aede379af4478d8444ab5b571a2" have entirely different histories.
be96257cd6
...
5f8f3eb171
17 changed files with 88 additions and 111 deletions
20
.sops.yaml
20
.sops.yaml
|
|
@ -1,27 +1,29 @@
|
|||
keys:
|
||||
# Users
|
||||
- &guanranwang age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
|
||||
|
||||
# ssh-to-age < /etc/ssh/ssh_host_ed25519_key.pub
|
||||
# Hosts
|
||||
# nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age'
|
||||
- &blacksteel age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
- &dust age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
|
||||
- &pek0 age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
- &tyo0 age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
|
||||
- &lightsail-tokyo age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
|
||||
creation_rules:
|
||||
- path_regex: hosts/pek0/secrets.yaml$
|
||||
- path_regex: hosts/blacksteel/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *pek0
|
||||
- *blacksteel
|
||||
- path_regex: hosts/tyo0/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *tyo0
|
||||
- *lightsail-tokyo
|
||||
- path_regex: nixos/profiles/sing-box/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *blacksteel
|
||||
- *dust
|
||||
- *pek0
|
||||
- path_regex: nixos/profiles/wireless/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
|
|
@ -31,6 +33,6 @@ creation_rules:
|
|||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *blacksteel
|
||||
- *dust
|
||||
- *pek0
|
||||
- *tyo0
|
||||
- *lightsail-tokyo
|
||||
|
|
|
|||
50
flake.lock
50
flake.lock
|
|
@ -51,11 +51,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726396892,
|
||||
"narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=",
|
||||
"lastModified": 1725377834,
|
||||
"narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce",
|
||||
"rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -86,11 +86,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726153070,
|
||||
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
|
||||
"lastModified": 1725234343,
|
||||
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
|
||||
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -146,11 +146,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726357542,
|
||||
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
|
||||
"lastModified": 1725180166,
|
||||
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
|
||||
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -210,11 +210,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726316254,
|
||||
"narHash": "sha256-82snaLYq0U2Wt5Vy+gFUmOTrjKEHOhm0uqaT6ycLKXc=",
|
||||
"lastModified": 1725050929,
|
||||
"narHash": "sha256-1z8i5qQwb28YM4cg1ji6b8f/5XDO30FIr/vObDRZbes=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "2c3b306495070c8b20a1f28f9f7143917bbff9e6",
|
||||
"revCount": 78,
|
||||
"rev": "d3b42cf643d03d675d19ec6259bb33538eaa706e",
|
||||
"revCount": 73,
|
||||
"type": "git",
|
||||
"url": "https://git.ny4.dev/nyancat/nvim"
|
||||
},
|
||||
|
|
@ -225,11 +225,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1725885300,
|
||||
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
|
||||
"lastModified": 1725477728,
|
||||
"narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
|
||||
"rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -240,11 +240,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1726365531,
|
||||
"narHash": "sha256-luAKNxWZ+ZN0kaHchx1OdLQ71n81Y31ryNPWP1YRDZc=",
|
||||
"lastModified": 1725534445,
|
||||
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9299cdf978e15f448cf82667b0ffdd480b44ee48",
|
||||
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -327,11 +327,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726382494,
|
||||
"narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=",
|
||||
"lastModified": 1725589472,
|
||||
"narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db",
|
||||
"rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -350,11 +350,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726218807,
|
||||
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
|
||||
"lastModified": 1725540166,
|
||||
"narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
|
||||
"rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -5,18 +5,6 @@
|
|||
|
||||
interactiveShellInit = ''
|
||||
set fish_greeting
|
||||
|
||||
set fish_cursor_default block
|
||||
set fish_cursor_insert line
|
||||
set fish_cursor_replace_one underscore
|
||||
set fish_cursor_replace underscore
|
||||
set fish_cursor_external line
|
||||
set fish_cursor_visual block
|
||||
|
||||
function fish_user_key_bindings
|
||||
fish_default_key_bindings -M insert
|
||||
fish_vi_key_bindings --no-erase insert
|
||||
end
|
||||
'';
|
||||
|
||||
plugins = [
|
||||
|
|
@ -34,22 +22,6 @@
|
|||
}
|
||||
];
|
||||
|
||||
shellAbbrs = {
|
||||
gi = "gitui";
|
||||
n = "nvim";
|
||||
s = "nh os switch";
|
||||
|
||||
g = "git";
|
||||
ga = "git add";
|
||||
gc = "git commit -m";
|
||||
gca = "git commit --amend";
|
||||
gd = "git diff";
|
||||
gds = "git diff --staged";
|
||||
gl = "git log";
|
||||
gp = "git push";
|
||||
gr = "git rebase -i --autosquash";
|
||||
};
|
||||
|
||||
functions =
|
||||
let
|
||||
jq = lib.getExe pkgs.jq;
|
||||
|
|
|
|||
|
|
@ -20,20 +20,4 @@
|
|||
|
||||
programs.gh.enable = true;
|
||||
programs.gitui.enable = true;
|
||||
|
||||
# vim keybinds
|
||||
# https://github.com/extrawurst/gitui/blob/master/KEY_CONFIG.md
|
||||
programs.gitui.keyConfig = ''
|
||||
(
|
||||
move_left: Some(( code: Char('h'), modifiers: "")),
|
||||
move_right: Some(( code: Char('l'), modifiers: "")),
|
||||
move_up: Some(( code: Char('k'), modifiers: "")),
|
||||
move_down: Some(( code: Char('j'), modifiers: "")),
|
||||
|
||||
stash_open: Some(( code: Char('l'), modifiers: "")),
|
||||
open_help: Some(( code: F(1), modifiers: "")),
|
||||
|
||||
status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
30
home/applications/kanshi/default.nix
Normal file
30
home/applications/kanshi/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
services.kanshi = {
|
||||
enable = true;
|
||||
settings = [
|
||||
{
|
||||
profile.name = "internal";
|
||||
profile.outputs = [
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
status = "enable";
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
profile.name = "external";
|
||||
profile.outputs = [
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
status = "disable";
|
||||
}
|
||||
{
|
||||
criteria = "ASUSTek COMPUTER INC VG27AQML1A S5LMQS059959";
|
||||
mode = "2560x1440@119.998";
|
||||
status = "enable";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,12 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
home.packages = [ pkgs.neovim ];
|
||||
home.packages = [
|
||||
(inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
})
|
||||
];
|
||||
|
||||
home.sessionVariables."EDITOR" = "nvim";
|
||||
xdg.configFile."nvim".source = inputs.neovim;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,25 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
pwvucontrol
|
||||
];
|
||||
|
||||
# remove csd window buttons
|
||||
# https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
|
||||
home.sessionVariables.GTK_CSD = 0;
|
||||
dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "appmenu:";
|
||||
|
||||
services.cliphist.enable = true;
|
||||
services.udiskie.enable = true;
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
checkConfig = false; # wtf?
|
||||
wrapperFeatures.gtk = true;
|
||||
systemd.xdgAutostart = true;
|
||||
xwayland = false;
|
||||
config = {
|
||||
### Visuals
|
||||
output."*".bg = "${inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.background} fill";
|
||||
|
|
|
|||
|
|
@ -21,12 +21,6 @@
|
|||
ripgrep.enable = true;
|
||||
skim.enable = true;
|
||||
zoxide.enable = true;
|
||||
mangohud.enable = true;
|
||||
};
|
||||
|
||||
services = {
|
||||
cliphist.enable = true;
|
||||
udiskie.enable = true;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -37,20 +31,7 @@
|
|||
fractal
|
||||
gnome-calculator
|
||||
hyperfine
|
||||
libnotify
|
||||
loupe
|
||||
pwvucontrol
|
||||
seahorse
|
||||
wl-clipboard
|
||||
|
||||
mumble
|
||||
osu-lazer-bin
|
||||
prismlauncher
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
# https://github.com/ppy/osu-framework/pull/6292
|
||||
"OSU_SDL3" = "1";
|
||||
"SDL_VIDEO_DRIVER" = "wayland";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
|
||||
|
||||
gtk3.bookmarks = [
|
||||
"smb://blacksteel/external"
|
||||
"file://${config.home.homeDirectory}/Documents/Projects/flake"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"audio/mpeg"
|
||||
"audio/ogg"
|
||||
"audio/wav"
|
||||
] (_n: [ "mpv.desktop" ])
|
||||
] (_n: [ "io.bassi.Amberol.desktop" ])
|
||||
### Image viewer
|
||||
// lib.genAttrs [
|
||||
"image/gif"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
"cef-binary"
|
||||
"dart"
|
||||
"go"
|
||||
"osu-lazer-bin"
|
||||
"rustc-bootstrap"
|
||||
"rustc-bootstrap-wrapper"
|
||||
"sof-firmware"
|
||||
|
|
@ -24,10 +23,6 @@
|
|||
lib.elem (lib.getName pkg) [
|
||||
"fcitx5-pinyin-minecraft"
|
||||
"fcitx5-pinyin-moegirl"
|
||||
"osu-lazer-bin"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,9 +71,6 @@
|
|||
networking.firewall.allowedTCPPorts = [ 53317 ];
|
||||
networking.firewall.allowedUDPPorts = [ 53317 ];
|
||||
|
||||
programs.gamemode.enable = true;
|
||||
programs.steam.enable = true;
|
||||
|
||||
programs.adb.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
programs.fish.enable = true;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
boot.loader.timeout = 0;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.kernelParams = [ "ia32_emulation=0" ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
allowNonSourcePredicate =
|
||||
pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
"adoptopenjdk-hotspot-bin"
|
||||
"cargo-bootstrap"
|
||||
"go"
|
||||
"minecraft-server"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
whitelist = {
|
||||
"Guanran928" = "86dbb6c5-8d8b-4c45-b8eb-b3fdf03bfb27";
|
||||
"i_love_ravens" = "2788dd4b-b010-4a2f-9b5c-aad0c0e0cba5";
|
||||
"e32ftedg" = "a54db5a0-67c2-476d-8457-a654dfbafd84";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
services.samba = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings."external" = {
|
||||
shares."external" = {
|
||||
"path" = "/mnt";
|
||||
"read only" = "no";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
allowNonSourcePredicate =
|
||||
pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
"adoptopenjdk-hotspot-bin"
|
||||
"cargo-bootstrap"
|
||||
"go"
|
||||
"keycloak"
|
||||
|
|
|
|||
Loading…
Reference in a new issue