nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: nki:master
Branches Tags
nki:master
nki:kakoune-package
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:move-s3
Branches Tags
nki:master
nki:kakoune-package
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

10 commits
master ... move-s3

Author SHA1 Message Date
Natsu Kagami 05c13f7b22
Move gts back to local, s3 made too many requests 2024-10-31 14:00:12 +01:00
Natsu Kagami 78805a8680
Properly track readiness of authentik for gts 2024-10-21 06:12:15 +02:00
Natsu Kagami 05c188e90e
Force heisenbridge to wait for conduit 2024-10-21 05:35:09 +02:00
Natsu Kagami 9b4991af49
Mount a shiny new volume 2024-10-21 05:14:26 +02:00
Natsu Kagami 4a5fbf3d9c
Move stuff to a new drive 2024-10-21 05:04:00 +02:00
Natsu Kagami 3e8dae05d1
Remove minio 2024-10-21 04:13:26 +02:00
Natsu Kagami 8561e6863d
Move gitea data to R2 2024-10-21 04:09:13 +02:00
Natsu Kagami 54700e75cd
Move outline to R2 2024-10-21 03:21:33 +02:00
Natsu Kagami ff70514a3d
Move gts s3 backend to r2 2024-10-21 01:22:37 +02:00
Natsu Kagami 945b8e73a4
Move gts s3 backend to hetzner (will move again) 2024-10-21 00:13:05 +02:00
7 changed files with 37 additions and 44 deletions
Show stats Expand all files Collapse all files

38
flake.lock
View file

@ -817,15 +817,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729298361, "lastModified": 1723503926,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -838,15 +838,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729360442, "lastModified": 1723510904,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6", "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
} }
}, },
"mpd-mpris": { "mpd-mpris": {
@ -1022,11 +1022,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1730272153, "lastModified": 1728409405,
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "narHash": "sha256-kk530XBUGDpt0DQbyUb3yDpSddPqF9PA5KTo/nsmmg0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "rev": "1366d1af8f58325602280e43ed6233849fb92216",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1166,11 +1166,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1731239293, "lastModified": 1726838390,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1549,11 +1549,11 @@
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1730740980, "lastModified": 1728746553,
"narHash": "sha256-Z/RLbhlBxdNPZt/DeROPBV7bLQgpmamjcB0rdQrQoNw=", "narHash": "sha256-BlZpmTt6wyMIpJvd5nEWGgqJQbtjVTzBlYYQVShZ7Io=",
"owner": "natsukagami", "owner": "natsukagami",
"repo": "youmubot", "repo": "youmubot",
"rev": "803d718c7ad34d3780ae6c2911ca0682b2417cc4", "rev": "c5354e30ad40f67938deed1deb5ea92bb168a586",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -31,7 +31,7 @@
}; };
arion.url = github:hercules-ci/arion; arion.url = github:hercules-ci/arion;
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

2
home/common-linux.nix
View file

@ -39,7 +39,7 @@ in
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
# Audio stuff! # Audio stuff!
# services.easyeffects.enable = true; services.easyeffects.enable = true;
# Bluetooth controls # Bluetooth controls
# services.mpris-proxy.enable = true; # services.mpris-proxy.enable = true;

3
home/modules/linux/graphical/default.nix
View file

@ -66,7 +66,7 @@ in
# Audio # Audio
qpwgraph # Pipewire graph qpwgraph # Pipewire graph
unstable.zotero zotero_7
libreoffice libreoffice
mpv # for anki mpv # for anki
@ -76,7 +76,6 @@ in
tdesktop tdesktop
whatsapp-for-linux whatsapp-for-linux
slack slack
zoom-us
librewolf librewolf

17
home/modules/linux/graphical/wayland.nix
View file

@ -61,12 +61,6 @@ let
''; '';
xdg.dataFile."dbus-1/services/org.freedesktop.Notifications.service".source = "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service"; xdg.dataFile."dbus-1/services/org.freedesktop.Notifications.service".source = "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service";
}; };
rofi-rbw-script = pkgs.writeShellApplication {
name = "rofi-rbw-script";
runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
text = "rofi-rbw";
};
in in
with lib; with lib;
{ {
@ -75,7 +69,6 @@ with lib;
# Additional packages # Additional packages
home.packages = with pkgs; [ home.packages = with pkgs; [
wl-clipboard # Clipboard management wl-clipboard # Clipboard management
rofi-rbw-script
# Mimic the clipboard stuff in MacOS # Mimic the clipboard stuff in MacOS
(pkgs.writeShellScriptBin "pbcopy" '' (pkgs.writeShellScriptBin "pbcopy" ''
@ -86,16 +79,6 @@ with lib;
'') '')
]; ];
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
cycle = true;
font = "monospace";
terminal = "${lib.getExe config.programs.kitty.package}";
theme = "Paper";
plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
};
home.sessionVariables = { home.sessionVariables = {
ANKI_WAYLAND = "1"; ANKI_WAYLAND = "1";
}; };

17
home/modules/programs/my-sway/default.nix
View file

@ -45,6 +45,12 @@ let
${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f - ${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
''; '';
rofi-rbw-script = pkgs.writeShellApplication {
name = "rofi-rbw-script";
runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
text = "rofi-rbw";
};
ignored-devices = [ "Surface_Headphones" ]; ignored-devices = [ "Surface_Headphones" ];
playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}"; playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}";
@ -217,7 +223,7 @@ in
# Launcher # Launcher
"${mod}+space" = "exec rofi -show drun"; "${mod}+space" = "exec rofi -show drun";
"${mod}+tab" = "exec ${./rofi-window.py}"; "${mod}+tab" = "exec ${./rofi-window.py}";
"${mod}+shift+p" = "exec rofi-rbw-script"; "${mod}+shift+p" = "exec ${lib.getExe rofi-rbw-script}";
} // { } // {
## Splits ## Splits
"${mod}+v" = "split v"; "${mod}+v" = "split v";
@ -775,9 +781,14 @@ in
# For waybar # For waybar
font-awesome font-awesome
]); ]);
config.programs.rofi = mkIf cfg.enable { config.programs.rofi = mkIf cfg.enable {
font = lib.mkForce "monospace ${toString cfg.fontSize}"; enable = true;
package = pkgs.rofi-wayland;
cycle = true;
font = "monospace ${toString cfg.fontSize}";
terminal = cfg.terminal;
theme = "Paper";
plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
}; };
} }

2
modules/personal/fonts/default.nix
View file

@ -10,7 +10,7 @@ with lib;
ibm-plex ibm-plex
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
noto-fonts noto-fonts
(pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk) noto-fonts-cjk
merriweather merriweather
corefonts corefonts
font-awesome font-awesome