1484 lines
66 KiB
Plaintext
1484 lines
66 KiB
Plaintext
|
[1mdiff --git flake.nix flake.nix[m
|
|||
|
|
[1mindex f222823..39cd281 100644[m
|
|||
|
|
[1m--- flake.nix[m
|
|||
|
|
[1m+++ flake.nix[m
|
|||
|
|
[36m@@ -22,13 +22,7 @@[m
|
|||
|
|
nur.url = "github:nix-community/NUR";[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
[31m- outputs =[m
|
|||
|
|
[31m- { self[m
|
|||
|
|
[31m- , nixpkgs[m
|
|||
|
|
[31m- , home-manager[m
|
|||
|
|
[31m- , nur[m
|
|||
|
|
[31m- , ...[m
|
|||
|
|
[31m- }@inputs:[m
|
|||
|
|
[32m+[m[32m outputs = { self, nixpkgs, home-manager, nur, ... }@inputs:[m
|
|||
|
|
let[m
|
|||
|
|
system = "x86_64-linux";[m
|
|||
|
|
pkgs = nixpkgs.legacyPackages.${system};[m
|
|||
|
|
[36m@@ -38,9 +32,9 @@[m
|
|||
|
|
{[m
|
|||
|
|
networking.hostName = host;[m
|
|||
|
|
boot.loader.systemd-boot = {[m
|
|||
|
|
[31m- enable = true;[m
|
|||
|
|
[31m- memtest86.enable = true;[m
|
|||
|
|
[31m- netbootxyz.enable = true;[m
|
|||
|
|
[32m+[m[32m enable = true;[m
|
|||
|
|
[32m+[m[32m memtest86.enable = true;[m
|
|||
|
|
[32m+[m[32m netbootxyz.enable = true;[m
|
|||
|
|
};[m
|
|||
|
|
boot.loader.timeout = 1;[m
|
|||
|
|
boot.loader.efi.canTouchEfiVariables = true;[m
|
|||
|
|
[36m@@ -48,15 +42,17 @@[m
|
|||
|
|
[m
|
|||
|
|
nix.settings = {[m
|
|||
|
|
substituters = [ "https://hyprland.cachix.org" ];[m
|
|||
|
|
[31m- trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];[m
|
|||
|
|
[32m+[m[32m trusted-public-keys = [[m
|
|||
|
|
[32m+[m[32m "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="[m
|
|||
|
|
[32m+[m[32m ];[m
|
|||
|
|
experimental-features = [ "nix-command" "flakes" ];[m
|
|||
|
|
auto-optimise-store = true;[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
nix.gc = {[m
|
|||
|
|
[31m- automatic = true;[m
|
|||
|
|
[31m- dates = "daily";[m
|
|||
|
|
[31m- options = "--delete-older-than 2d";[m
|
|||
|
|
[32m+[m[32m automatic = true;[m
|
|||
|
|
[32m+[m[32m dates = "daily";[m
|
|||
|
|
[32m+[m[32m options = "--delete-older-than 2d";[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
programs.zsh.enable = true;[m
|
|||
|
|
[36m@@ -99,12 +95,7 @@[m
|
|||
|
|
shell = pkgs.zsh;[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- environment.systemPackages = with pkgs; [[m
|
|||
|
|
[31m- wget[m
|
|||
|
|
[31m- curl[m
|
|||
|
|
[31m- git[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m environment.systemPackages = with pkgs; [ wget curl git ];[m
|
|||
|
|
[m
|
|||
|
|
services.openssh = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
[36m@@ -116,7 +107,8 @@[m
|
|||
|
|
[m
|
|||
|
|
networking.firewall.enable = false;[m
|
|||
|
|
system.stateVersion = "23.11";[m
|
|||
|
|
[31m- environment.sessionVariables.NIXOS_OZONE_WL = "1"; #hint electron apps to use wayland:[m
|
|||
|
|
[32m+[m[32m environment.sessionVariables.NIXOS_OZONE_WL =[m
|
|||
|
|
[32m+[m[32m "1"; # hint electron apps to use wayland:[m
|
|||
|
|
[m
|
|||
|
|
fonts.packages = with pkgs; [[m
|
|||
|
|
noto-fonts[m
|
|||
|
|
[36m@@ -130,31 +122,25 @@[m
|
|||
|
|
home-manager.nixosModules.home-manager[m
|
|||
|
|
{[m
|
|||
|
|
home-manager = {[m
|
|||
|
|
[31m- extraSpecialArgs = { inherit inputs; }; # allows access to flake inputs in hm modules[m
|
|||
|
|
[32m+[m[32m extraSpecialArgs = {[m
|
|||
|
|
[32m+[m[32m inherit inputs;[m
|
|||
|
|
[32m+[m[32m }; # allows access to flake inputs in hm modules[m
|
|||
|
|
useGlobalPkgs = true;[m
|
|||
|
|
useUserPackages = true;[m
|
|||
|
|
[31m- users.${user} = {[m
|
|||
|
|
[31m- imports = [ ./home/${host}.nix ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m users.${user} = { imports = [ ./home/${host}.nix ]; };[m
|
|||
|
|
};[m
|
|||
|
|
}[m
|
|||
|
|
./hosts/${host}[m
|
|||
|
|
];[m
|
|||
|
|
[31m- mkSystem = host: cfg: nixpkgs.lib.nixosSystem {[m
|
|||
|
|
[31m- system = cfg.system or "x86_64-linux";[m
|
|||
|
|
[31m- modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);[m
|
|||
|
|
[31m- specialArgs = inputs;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- systems = {[m
|
|||
|
|
[31m- nixos = {[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- Kell = {[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[32m+[m[32m mkSystem = host: cfg:[m
|
|||
|
|
[32m+[m[32m nixpkgs.lib.nixosSystem {[m
|
|||
|
|
[32m+[m[32m system = cfg.system or "x86_64-linux";[m
|
|||
|
|
[32m+[m[32m modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);[m
|
|||
|
|
[32m+[m[32m specialArgs = inputs;[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m[32m systems = {[m
|
|||
|
|
[32m+[m[32m nixos = { user = "user"; };[m
|
|||
|
|
[32m+[m[32m Kell = { user = "user"; };[m
|
|||
|
|
};[m
|
|||
|
|
[31m- in[m
|
|||
|
|
[31m- {[m
|
|||
|
|
[31m- nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m in { nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/Kell.nix home/Kell.nix[m
|
|||
|
|
[1mindex d6205a7..6d95393 100644[m
|
|||
|
|
[1m--- home/Kell.nix[m
|
|||
|
|
[1m+++ home/Kell.nix[m
|
|||
|
|
[36m@@ -2,13 +2,13 @@[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
imports = [[m
|
|||
|
|
[31m- (import ./common.nix { inherit inputs config pkgs; })[m
|
|||
|
|
[31m- (import ./hyprland { inherit inputs pkgs; })[m
|
|||
|
|
[31m- (import ./waybar { inherit inputs pkgs; })[m
|
|||
|
|
[31m- ./rofi[m
|
|||
|
|
[31m- ./alacritty[m
|
|||
|
|
[31m- ./firefox[m
|
|||
|
|
[31m- ./ssh[m
|
|||
|
|
[32m+[m[32m (import ./common.nix { inherit inputs config pkgs; })[m
|
|||
|
|
[32m+[m[32m (import ./hyprland { inherit inputs pkgs; })[m
|
|||
|
|
[32m+[m[32m (import ./waybar { inherit inputs pkgs; })[m
|
|||
|
|
[32m+[m[32m ./rofi[m
|
|||
|
|
[32m+[m[32m ./alacritty[m
|
|||
|
|
[32m+[m[32m ./firefox[m
|
|||
|
|
[32m+[m[32m ./ssh[m
|
|||
|
|
];[m
|
|||
|
|
services.hyprpaper = {[m
|
|||
|
|
settings = {[m
|
|||
|
|
[36m@@ -21,14 +21,8 @@[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
gtk.iconTheme = {[m
|
|||
|
|
[31m- name = "Papirus";[m
|
|||
|
|
[31m- gtk.iconTheme.package = pkgs.papirus-icon-theme;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- programs.waybar = {[m
|
|||
|
|
[31m- settings = {[m
|
|||
|
|
[31m- mainBar = {[m
|
|||
|
|
[31m- output = "DP-2";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m name = "Papirus";[m
|
|||
|
|
[32m+[m[32m gtk.iconTheme.package = pkgs.papirus-icon-theme;[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m[32m programs.waybar = { settings = { mainBar = { output = "DP-2"; }; }; };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/alacritty/default.nix home/alacritty/default.nix[m
|
|||
|
|
[1mindex dc9799f..b8e2d40 100644[m
|
|||
|
|
[1m--- home/alacritty/default.nix[m
|
|||
|
|
[1m+++ home/alacritty/default.nix[m
|
|||
|
|
[36m@@ -77,51 +77,51 @@[m
|
|||
|
|
action = "ReceiveChar";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[72;6u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[72;6u";[m
|
|||
|
|
key = "H";[m
|
|||
|
|
mods = "Control|Shift";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[74;6u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[74;6u";[m
|
|||
|
|
key = "J";[m
|
|||
|
|
mods = "Control|Shift";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[75;6u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[75;6u";[m
|
|||
|
|
key = "K";[m
|
|||
|
|
mods = "Control|Shift";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[76;6u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[76;6u";[m
|
|||
|
|
key = "L";[m
|
|||
|
|
mods = "Control|Shift";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[105;5u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[105;5u";[m
|
|||
|
|
key = "I";[m
|
|||
|
|
mods = "Control";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[46;5u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[46;5u";[m
|
|||
|
|
key = "Period";[m
|
|||
|
|
mods = "Control";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[44;5u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[44;5u";[m
|
|||
|
|
key = "Comma";[m
|
|||
|
|
mods = "Control";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[59;5u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[59;5u";[m
|
|||
|
|
key = "Semicolon";[m
|
|||
|
|
mods = "Control";[m
|
|||
|
|
}[m
|
|||
|
|
{[m
|
|||
|
|
[31m- chars = "\u001B[13;2u";[m
|
|||
|
|
[32m+[m[32m chars = "u001B[13;2u";[m
|
|||
|
|
key = "Return";[m
|
|||
|
|
mods = "Shift";[m
|
|||
|
|
}[m
|
|||
|
|
];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
};[m
|
|||
|
|
[31m- }[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m}[m
|
|||
|
|
[1mdiff --git home/common.nix home/common.nix[m
|
|||
|
|
[1mindex 5e568e8..93d0d6b 100644[m
|
|||
|
|
[1m--- home/common.nix[m
|
|||
|
|
[1m+++ home/common.nix[m
|
|||
|
|
[36m@@ -1,23 +1,13 @@[m
|
|||
|
|
{ inputs, config, pkgs, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
[31m- imports = [[m
|
|||
|
|
[31m- ./zsh[m
|
|||
|
|
[31m- ./git[m
|
|||
|
|
[31m- ./nvim[m
|
|||
|
|
[31m- ./email[m
|
|||
|
|
[31m- ./lf[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m imports = [ ./zsh ./git ./nvim ./email ./lf ];[m
|
|||
|
|
[m
|
|||
|
|
home.stateVersion = "24.11";[m
|
|||
|
|
targets.genericLinux.enable = true;[m
|
|||
|
|
nixpkgs.config.allowUnfree = true;[m
|
|||
|
|
programs.home-manager.enable = true;[m
|
|||
|
|
[31m- home.packages = with pkgs; [[m
|
|||
|
|
[31m- htop[m
|
|||
|
|
[31m- waypipe[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[31m-[m
|
|||
|
|
[32m+[m[32m home.packages = with pkgs; [ htop waypipe ];[m
|
|||
|
|
[m
|
|||
|
|
home.sessionVariables = {[m
|
|||
|
|
XDG_CONFIG_HOME = "${config.xdg.configHome}";[m
|
|||
|
|
[1mdiff --git home/email/default.nix home/email/default.nix[m
|
|||
|
|
[1mindex caeaa36..6140376 100644[m
|
|||
|
|
[1m--- home/email/default.nix[m
|
|||
|
|
[1m+++ home/email/default.nix[m
|
|||
|
|
[36m@@ -2,26 +2,21 @@[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
home.file = {[m
|
|||
|
|
[31m- ".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";[m
|
|||
|
|
[32m+[m[32m ".mailcap".text =[m
|
|||
|
|
[32m+[m[32m "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";[m
|
|||
|
|
};[m
|
|||
|
|
[31m- home.packages = with pkgs; [[m
|
|||
|
|
[31m- mailcap[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m home.packages = with pkgs; [ mailcap ];[m
|
|||
|
|
[m
|
|||
|
|
programs.notmuch = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
extraConfig = {[m
|
|||
|
|
[31m- database = {[m
|
|||
|
|
[31m- path = "/home/user/.config/aerc/mail";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m database = { path = "/home/user/.config/aerc/mail"; };[m
|
|||
|
|
user = {[m
|
|||
|
|
name = "Thomas Avé";[m
|
|||
|
|
primary_email = "email@thomasave.be";[m
|
|||
|
|
other_email = "Thomas.Ave@uantwerpen.be;Thomas.Ave@imec.be;";[m
|
|||
|
|
};[m
|
|||
|
|
[31m- maildir = {[m
|
|||
|
|
[31m- synchronize_flags = "true";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m maildir = { synchronize_flags = "true"; };[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
programs.aerc = {[m
|
|||
|
|
[36m@@ -157,9 +152,7 @@[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
extraConfig = {[m
|
|||
|
|
[31m- general = {[m
|
|||
|
|
[31m- term = "xterm-256color";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m general = { term = "xterm-256color"; };[m
|
|||
|
|
ui = {[m
|
|||
|
|
border-char-vertical = "│";[m
|
|||
|
|
border-char-horizontal = "─";[m
|
|||
|
|
[36m@@ -170,12 +163,8 @@[m
|
|||
|
|
dirlist-right = "{{if .Unread}}{{humanReadable .Unread}}{{end}}";[m
|
|||
|
|
dirlist-tree = true;[m
|
|||
|
|
};[m
|
|||
|
|
[31m- viewer = {[m
|
|||
|
|
[31m- pager = "nvim -u $XDG_CONFIG_HOME/nvim/aerc.lua";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- compose = {[m
|
|||
|
|
[31m- address-book-cmd = "notmuch address \"\%s\"";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m viewer = { pager = "nvim -u $XDG_CONFIG_HOME/nvim/aerc.lua"; };[m
|
|||
|
|
[32m+[m[32m compose = { address-book-cmd = ''notmuch address "%s"''; };[m
|
|||
|
|
multipart-converters = {[m
|
|||
|
|
"text/html" = "w3m -dump -o display_link_number=1 -T text/html";[m
|
|||
|
|
};[m
|
|||
|
|
[36m@@ -185,13 +174,14 @@[m
|
|||
|
|
"message/delivery-status" = "cat";[m
|
|||
|
|
"message/rfc822" = "cat";[m
|
|||
|
|
"text/html" = "w3m -dump -o display_link_number=1 -T text/html";[m
|
|||
|
|
[31m- "text/*" = "bat -fP --file-name=\"$AERC_FILENAME\"";[m
|
|||
|
|
[32m+[m[32m "text/*" = ''bat -fP --file-name="$AERC_FILENAME"'';[m
|
|||
|
|
"application/x-sh" = "bat -fP -l sh";[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
[31m- home.file."${config.xdg.configHome}/aerc/map.conf".text = "Inbox=tag:inbox and not tag:archived and not tag:deleted";[m
|
|||
|
|
[32m+[m[32m home.file."${config.xdg.configHome}/aerc/map.conf".text =[m
|
|||
|
|
[32m+[m[32m "Inbox=tag:inbox and not tag:archived and not tag:deleted";[m
|
|||
|
|
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''[m
|
|||
|
|
*.default=true[m
|
|||
|
|
*.normal=true[m
|
|||
|
|
[1mdiff --git home/firefox/default.nix home/firefox/default.nix[m
|
|||
|
|
[1mindex 4ba4256..72c6564 100644[m
|
|||
|
|
[1m--- home/firefox/default.nix[m
|
|||
|
|
[1m+++ home/firefox/default.nix[m
|
|||
|
|
[36m@@ -1,98 +1,106 @@[m
|
|||
|
|
[31m-{inputs, pkgs, ...}:[m
|
|||
|
|
[32m+[m[32m{ inputs, pkgs, ... }:[m
|
|||
|
|
let[m
|
|||
|
|
[31m-lock-false = {[m
|
|||
|
|
[32m+[m[32m lock-false = {[m
|
|||
|
|
Value = false;[m
|
|||
|
|
Status = "locked";[m
|
|||
|
|
[31m-};[m
|
|||
|
|
[31m-lock-true = {[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m lock-true = {[m
|
|||
|
|
Value = true;[m
|
|||
|
|
Status = "locked";[m
|
|||
|
|
[31m-};[m
|
|||
|
|
[31m-in[m
|
|||
|
|
[31m-{[m
|
|||
|
|
[31m- programs.firefox = {[m
|
|||
|
|
[31m- enable = true;[m
|
|||
|
|
[31m- policies = {[m
|
|||
|
|
[31m- DisableTelemetry = true;[m
|
|||
|
|
[31m- DisableFirefoxStudies = true;[m
|
|||
|
|
[31m- DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"[m
|
|||
|
|
[31m- EnableTrackingProtection = {[m
|
|||
|
|
[31m- Value = true;[m
|
|||
|
|
[31m- Locked = true;[m
|
|||
|
|
[31m- Cryptomining = true;[m
|
|||
|
|
[31m- Fingerprinting = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- ExtensionSettings = {[m
|
|||
|
|
[31m- "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {[m
|
|||
|
|
[31m- install_url = "file://${./files/signed.xpi}";[m
|
|||
|
|
[31m- installation_mode = "normal_installed";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- "@contain-google" = {[m
|
|||
|
|
[31m- install_url = "https://addons.mozilla.org/firefox/downloads/latest/google-container/latest.xpi";[m
|
|||
|
|
[31m- installation_mode = "normal_installed";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- "{ea4204c0-3209-4116-afd2-2a208e21a779}" = {[m
|
|||
|
|
[31m- install_url = "https://addons.mozilla.org/firefox/downloads/latest/enable-bing-chat/latest.xpi";[m
|
|||
|
|
[31m- installation_mode = "normal_installed";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- "{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {[m
|
|||
|
|
[31m- install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";[m
|
|||
|
|
[31m- installation_mode = "normal_installed";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32min {[m
|
|||
|
|
[32m+[m[32m programs.firefox = {[m
|
|||
|
|
[32m+[m[32m enable = true;[m
|
|||
|
|
[32m+[m[32m policies = {[m
|
|||
|
|
[32m+[m[32m DisableTelemetry = true;[m
|
|||
|
|
[32m+[m[32m DisableFirefoxStudies = true;[m
|
|||
|
|
[32m+[m[32m DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"[m
|
|||
|
|
[32m+[m[32m EnableTrackingProtection = {[m
|
|||
|
|
[32m+[m[32m Value = true;[m
|
|||
|
|
[32m+[m[32m Locked = true;[m
|
|||
|
|
[32m+[m[32m Cryptomining = true;[m
|
|||
|
|
[32m+[m[32m Fingerprinting = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m ExtensionSettings = {[m
|
|||
|
|
[32m+[m[32m "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {[m
|
|||
|
|
[32m+[m[32m install_url = "file://${./files/signed.xpi}";[m
|
|||
|
|
[32m+[m[32m installation_mode = "normal_installed";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m "@contain-google" = {[m
|
|||
|
|
[32m+[m[32m install_url =[m
|
|||
|
|
[32m+[m[32m "https://addons.mozilla.org/firefox/downloads/latest/google-container/latest.xpi";[m
|
|||
|
|
[32m+[m[32m installation_mode = "normal_installed";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m "{ea4204c0-3209-4116-afd2-2a208e21a779}" = {[m
|
|||
|
|
[32m+[m[32m install_url =[m
|
|||
|
|
[32m+[m[32m "https://addons.mozilla.org/firefox/downloads/latest/enable-bing-chat/latest.xpi";[m
|
|||
|
|
[32m+[m[32m installation_mode = "normal_installed";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m "{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {[m
|
|||
|
|
[32m+[m[32m install_url =[m
|
|||
|
|
[32m+[m[32m "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";[m
|
|||
|
|
[32m+[m[32m installation_mode = "normal_installed";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m profiles = {[m
|
|||
|
|
[32m+[m[32m default = {[m
|
|||
|
|
[32m+[m[32m id = 0;[m
|
|||
|
|
[32m+[m[32m name = "default";[m
|
|||
|
|
[32m+[m[32m isDefault = true;[m
|
|||
|
|
[32m+[m[32m search = {[m
|
|||
|
|
[32m+[m[32m force = true;[m
|
|||
|
|
[32m+[m[32m default = "DuckDuckGo";[m
|
|||
|
|
[32m+[m[32m order = [ "DuckDuckGo" "Google" ];[m
|
|||
|
|
};[m
|
|||
|
|
[31m- profiles = {[m
|
|||
|
|
[31m- default = {[m
|
|||
|
|
[31m- id = 0;[m
|
|||
|
|
[31m- name = "default";[m
|
|||
|
|
[31m- isDefault = true;[m
|
|||
|
|
[31m- search = {[m
|
|||
|
|
[31m- force = true;[m
|
|||
|
|
[31m- default = "DuckDuckGo";[m
|
|||
|
|
[31m- order = [ "DuckDuckGo" "Google" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- extensions = with pkgs.nur.repos.rycee.firefox-addons; [[m
|
|||
|
|
[31m- ublock-origin[m
|
|||
|
|
[31m- bitwarden[m
|
|||
|
|
[31m- privacy-badger[m
|
|||
|
|
[31m- beyond-20[m
|
|||
|
|
[31m- display-_anchors[m
|
|||
|
|
[31m- facebook-container[m
|
|||
|
|
[31m- multi-account-containers[m
|
|||
|
|
[31m- istilldontcareaboutcookies[m
|
|||
|
|
[31m- return-youtube-dislikes[m
|
|||
|
|
[31m- sponsorblock[m
|
|||
|
|
[31m- unpaywall[m
|
|||
|
|
[31m- vimium[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[31m- settings = {[m
|
|||
|
|
[31m- "browser.disableResetPrompt" = true;[m
|
|||
|
|
[31m- "browser.download.panel.shown" = true;[m
|
|||
|
|
[31m- "browser.shell.checkDefaultBrowser" = false;[m
|
|||
|
|
[31m- "browser.tabs.inTitlebar" = 0;[m
|
|||
|
|
[31m- "browser.shell.defaultBrowserCheckCount" = 1;[m
|
|||
|
|
[31m- "browser.startup.homepage" = "https://start.duckduckgo.com";[m
|
|||
|
|
[31m- "browser.compactmode.show" = true;[m
|
|||
|
|
[31m- "browser.uidensity" = 1;[m
|
|||
|
|
[31m- "extensions.update.enabled" = false;[m
|
|||
|
|
[31m- "extensions.pocket.enabled" = lock-false;[m
|
|||
|
|
[31m- "extensions.autoDisableScopes" = 0;[m
|
|||
|
|
[31m- "browser.newtabpage.activity-stream.showSponsored" = lock-false;[m
|
|||
|
|
[31m- "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;[m
|
|||
|
|
[31m- "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;[m
|
|||
|
|
[31m- "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; };[m
|
|||
|
|
[31m- "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":["fxa-toolbar-menu-button","developer-button"],"unified-extensions-area":["sponsorblocker_ajay_app-browser-action","_testpilot-containers-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_contain-facebook-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","chrome-gnome-shell_gnome_org-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","ublock0_raymondhill_net-browser-action","reset-pbm-toolbar-button","adguardadblocker_adguard_com-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["developer-button","profiler-button","chrome-gnome-shell_gnome_org-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_contain-facebook-browser-action","_testpilot-containers-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","adguardadblocker_adguard_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","sponsorblocker_ajay_app-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list","unified-extensions-area"],"currentVersion":20,"newElementCount":11}'';[m
|
|||
|
|
[31m- "privacy.trackingprotection.enabled" = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m extensions = with pkgs.nur.repos.rycee.firefox-addons; [[m
|
|||
|
|
[32m+[m[32m ublock-origin[m
|
|||
|
|
[32m+[m[32m bitwarden[m
|
|||
|
|
[32m+[m[32m privacy-badger[m
|
|||
|
|
[32m+[m[32m beyond-20[m
|
|||
|
|
[32m+[m[32m display-_anchors[m
|
|||
|
|
[32m+[m[32m facebook-container[m
|
|||
|
|
[32m+[m[32m multi-account-containers[m
|
|||
|
|
[32m+[m[32m istilldontcareaboutcookies[m
|
|||
|
|
[32m+[m[32m return-youtube-dislikes[m
|
|||
|
|
[32m+[m[32m sponsorblock[m
|
|||
|
|
[32m+[m[32m unpaywall[m
|
|||
|
|
[32m+[m[32m vimium[m
|
|||
|
|
[32m+[m[32m ];[m
|
|||
|
|
[32m+[m[32m settings = {[m
|
|||
|
|
[32m+[m[32m "browser.disableResetPrompt" = true;[m
|
|||
|
|
[32m+[m[32m "browser.download.panel.shown" = true;[m
|
|||
|
|
[32m+[m[32m "browser.shell.checkDefaultBrowser" = false;[m
|
|||
|
|
[32m+[m[32m "browser.tabs.inTitlebar" = 0;[m
|
|||
|
|
[32m+[m[32m "browser.shell.defaultBrowserCheckCount" = 1;[m
|
|||
|
|
[32m+[m[32m "browser.startup.homepage" = "https://start.duckduckgo.com";[m
|
|||
|
|
[32m+[m[32m "browser.compactmode.show" = true;[m
|
|||
|
|
[32m+[m[32m "browser.uidensity" = 1;[m
|
|||
|
|
[32m+[m[32m "extensions.update.enabled" = false;[m
|
|||
|
|
[32m+[m[32m "extensions.pocket.enabled" = lock-false;[m
|
|||
|
|
[32m+[m[32m "extensions.autoDisableScopes" = 0;[m
|
|||
|
|
[32m+[m[32m "browser.newtabpage.activity-stream.showSponsored" = lock-false;[m
|
|||
|
|
[32m+[m[32m "browser.newtabpage.activity-stream.system.showSponsored" =[m
|
|||
|
|
[32m+[m[32m lock-false;[m
|
|||
|
|
[32m+[m[32m "browser.newtabpage.activity-stream.showSponsoredTopSites" =[m
|
|||
|
|
[32m+[m[32m lock-false;[m
|
|||
|
|
[32m+[m[32m "browser.contentblocking.category" = {[m
|
|||
|
|
[32m+[m[32m Value = "strict";[m
|
|||
|
|
[32m+[m[32m Status = "locked";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m "browser.uiCustomization.state" = ''[m
|
|||
|
|
[32m+[m[32m {"placements":{"widget-overflow-fixed-list":["fxa-toolbar-menu-button","developer-button"],"unified-extensions-area":["sponsorblocker_ajay_app-browser-action","_testpilot-containers-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_contain-facebook-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","chrome-gnome-shell_gnome_org-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","ublock0_raymondhill_net-browser-action","reset-pbm-toolbar-button","adguardadblocker_adguard_com-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["developer-button","profiler-button","chrome-gnome-shell_gnome_org-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_contain-facebook-browser-action","_testpilot-containers-browser-action","jid1-kkzogwgsw3ao4q_jetpack-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","beyond20_kakaroto_homelinux_net-browser-action","_12cf650b-1822-40aa-bff0-996df6948878_-browser-action","_3e4d2037-d300-4e95-859d-3cba866f46d3_-browser-action","save-as-pdf-ff_pdfcrowd_com-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","user-agent-switcher_ninetailed_ninja-browser-action","_d66c8515-1e0d-408f-82ee-2682f2362726_-browser-action","_ea4204c0-3209-4116-afd2-2a208e21a779_-browser-action","adguardadblocker_adguard_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","sponsorblocker_ajay_app-browser-action","display-anchors_robwu_nl-browser-action","firefoxcolor_mozilla_com-browser-action","search_kagi_com-browser-action","_7a7a4a92-a2a0-41d1-9fd7-1e92480d612d_-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list","unified-extensions-area"],"currentVersion":20,"newElementCount":11}'';[m
|
|||
|
|
[32m+[m[32m "privacy.trackingprotection.enabled" = true;[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
[31m- xdg.mimeApps.defaultApplications = {[m
|
|||
|
|
[31m- "text/html" = ["firefox.desktop"];[m
|
|||
|
|
[31m- "text/xml" = ["firefox.desktop"];[m
|
|||
|
|
[31m- "x-scheme-handler/http" = ["firefox.desktop"];[m
|
|||
|
|
[31m- "x-scheme-handler/https" = ["firefox.desktop"];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m xdg.mimeApps.defaultApplications = {[m
|
|||
|
|
[32m+[m[32m "text/html" = [ "firefox.desktop" ];[m
|
|||
|
|
[32m+[m[32m "text/xml" = [ "firefox.desktop" ];[m
|
|||
|
|
[32m+[m[32m "x-scheme-handler/http" = [ "firefox.desktop" ];[m
|
|||
|
|
[32m+[m[32m "x-scheme-handler/https" = [ "firefox.desktop" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/hyprland/default.nix home/hyprland/default.nix[m
|
|||
|
|
[1mindex b7b4e09..ab282dc 100644[m
|
|||
|
|
[1m--- home/hyprland/default.nix[m
|
|||
|
|
[1m+++ home/hyprland/default.nix[m
|
|||
|
|
[36m@@ -1,7 +1,4 @@[m
|
|||
|
|
[31m-{ inputs[m
|
|||
|
|
[31m-, pkgs[m
|
|||
|
|
[31m-, ...[m
|
|||
|
|
[31m-}:[m
|
|||
|
|
[32m+[m[32m{ inputs, pkgs, ... }:[m
|
|||
|
|
let[m
|
|||
|
|
hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;[m
|
|||
|
|
playerctl = "${pkgs.playerctl}/bin/playerctl";[m
|
|||
|
|
[36m@@ -17,11 +14,11 @@[m [mlet[m
|
|||
|
|
rofi = "${pkgs.rofi}/bin/rofi";[m
|
|||
|
|
jq = "${pkgs.jq}/bin/jq";[m
|
|||
|
|
rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" ''[m
|
|||
|
|
[31m- accounts=''$(${pkgs.yubikey-manager}/bin/ykman oath accounts list)[m
|
|||
|
|
[32m+[m[32m accounts=$(${pkgs.yubikey-manager}/bin/ykman oath accounts list)[m
|
|||
|
|
prompt="YubiKey OATH"[m
|
|||
|
|
[31m- account=''$(echo "''${accounts/, TOTP/\n}" | awk '{ print $0 "\0icon\x1fyubioath"; }' | ${rofi} -dmenu -i -p "''$prompt" ''${shortcuts[@]})[m
|
|||
|
|
[31m- code=''$(${pkgs.yubikey-manager}/bin/ykman oath accounts code "''$account")[m
|
|||
|
|
[31m- IFS=', ' read -r -a code <<< "''$code"[m
|
|||
|
|
[32m+[m[32m account=$(echo "''${accounts/, TOTP/\n}" | awk '{ print $0 "\0icon\x1fyubioath"; }' | ${rofi} -dmenu -i -p "$prompt" ''${shortcuts[@]})[m
|
|||
|
|
[32m+[m[32m code=$(${pkgs.yubikey-manager}/bin/ykman oath accounts code "$account")[m
|
|||
|
|
[32m+[m[32m IFS=', ' read -r -a code <<< "$code"[m
|
|||
|
|
echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy;[m
|
|||
|
|
'';[m
|
|||
|
|
[m
|
|||
|
|
[36m@@ -60,25 +57,21 @@[m [mlet[m
|
|||
|
|
fi[m
|
|||
|
|
fi[m
|
|||
|
|
'';[m
|
|||
|
|
[31m-in[m
|
|||
|
|
[31m-{[m
|
|||
|
|
[32m+[m[32min {[m
|
|||
|
|
services.kdeconnect = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
package = pkgs.kdePackages.kdeconnect-kde;[m
|
|||
|
|
indicator = true;[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
[31m- home.packages = with pkgs; [[m
|
|||
|
|
[31m- wl-clipboard[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m home.packages = with pkgs; [ wl-clipboard ];[m
|
|||
|
|
[m
|
|||
|
|
services.hyprpaper = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
settings = {[m
|
|||
|
|
ipc = "on";[m
|
|||
|
|
splash = false;[m
|
|||
|
|
[31m- preload =[m
|
|||
|
|
[31m- [ "${./files/wallpaper.png}" ];[m
|
|||
|
|
[32m+[m[32m preload = [ "${./files/wallpaper.png}" ];[m
|
|||
|
|
wallpaper = [[m
|
|||
|
|
# Fill in by host-specific config![m
|
|||
|
|
# "Display,${./files/wallpaper.png}"[m
|
|||
|
|
[36m@@ -127,9 +120,7 @@[m [min[m
|
|||
|
|
"TERMINAL,${alacritty}"[m
|
|||
|
|
"WLR_RENDERER_ALLOW_SOFTWARE,1"[m
|
|||
|
|
];[m
|
|||
|
|
[31m- debug = {[m
|
|||
|
|
[31m- disable_logs = false;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m debug = { disable_logs = false; };[m
|
|||
|
|
windowrulev2 = [[m
|
|||
|
|
"float, title:^(rofi)(.*)$"[m
|
|||
|
|
"center, title:^(rofi)(.*)$"[m
|
|||
|
|
[36m@@ -138,9 +129,7 @@[m [min[m
|
|||
|
|
"minsize 1 1, title:^()$,class:^(steam)$"[m
|
|||
|
|
"stayfocused, title:^()$,class:^(steam)$"[m
|
|||
|
|
];[m
|
|||
|
|
[31m- windowrule = [[m
|
|||
|
|
[31m- "noanim,waybar"[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m windowrule = [ "noanim,waybar" ];[m
|
|||
|
|
monitor = [[m
|
|||
|
|
"DP-3,preferred,0x550,1"[m
|
|||
|
|
"DP-2,preferred,1920x0,1"[m
|
|||
|
|
[36m@@ -160,20 +149,12 @@[m [min[m
|
|||
|
|
kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";[m
|
|||
|
|
numlock_by_default = true;[m
|
|||
|
|
};[m
|
|||
|
|
[31m- binds = {[m
|
|||
|
|
[31m- scroll_event_delay = 1;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- xwayland = {[m
|
|||
|
|
[31m- force_zero_scaling = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- misc = {[m
|
|||
|
|
[31m- disable_hyprland_logo = 1;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m binds = { scroll_event_delay = 1; };[m
|
|||
|
|
[32m+[m[32m xwayland = { force_zero_scaling = true; };[m
|
|||
|
|
[32m+[m[32m misc = { disable_hyprland_logo = 1; };[m
|
|||
|
|
decoration = {[m
|
|||
|
|
rounding = 1;[m
|
|||
|
|
[31m- blur = {[m
|
|||
|
|
[31m- enabled = false;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m blur = { enabled = false; };[m
|
|||
|
|
};[m
|
|||
|
|
animations = {[m
|
|||
|
|
enabled = "yes";[m
|
|||
|
|
[36m@@ -216,11 +197,14 @@[m [min[m
|
|||
|
|
"$mainMod, F, togglefloating,"[m
|
|||
|
|
"$mainMod, SPACE, togglesplit, # dwindle"[m
|
|||
|
|
"CONTROL_L ALT_L, L, exec, ${swaylock}"[m
|
|||
|
|
[31m- "$mainMod, C, exec, cliphist list | awk '{print $0, \"\0icon\x1fcom.github.davidmhewitt.clipped\"}' | ${rofi} -dmenu -display-columns 2 | cliphist decode | wl-copy"[m
|
|||
|
|
[32m+[m[32m ''[m
|
|||
|
|
[32m+[m[32m $mainMod, C, exec, cliphist list | awk '{print $0, "0iconx1fcom.github.davidmhewitt.clipped"}' | ${rofi} -dmenu -display-columns 2 | cliphist decode | wl-copy''[m
|
|||
|
|
"$mainMod, Y, exec, ${rofi-ykman}/bin/rofi-ykman"[m
|
|||
|
|
"$mainMod, N, exec, ${./files/rofi-ssh.sh}"[m
|
|||
|
|
[m
|
|||
|
|
[31m- "$mainMod, Escape, exec, ${rofi} -show power-menu -modi power-menu:${./files/rofi-power-menu.sh}"[m
|
|||
|
|
[32m+[m[32m "$mainMod, Escape, exec, ${rofi} -show power-menu -modi power-menu:${[m
|
|||
|
|
[32m+[m[32m ./files/rofi-power-menu.sh[m
|
|||
|
|
[32m+[m[32m }"[m
|
|||
|
|
[m
|
|||
|
|
",XF86MonBrightnessUp, exec, xbacklight -inc 10"[m
|
|||
|
|
",XF86MonBrightnessDown, exec, xbacklight -dec 10"[m
|
|||
|
|
[36m@@ -235,7 +219,7 @@[m [min[m
|
|||
|
|
"$mainMod,XF86AudioMute, exec, ${playerctl} play-pause"[m
|
|||
|
|
"$mainMod,XF86AudioRaiseVolume, exec, ${playerctl} next"[m
|
|||
|
|
"$mainMod,XF86AudioLowerVolume, exec, ${playerctl} previous"[m
|
|||
|
|
[31m- ", Print, exec, grim -g \"$(slurp -d)\" - | wl-copy"[m
|
|||
|
|
[32m+[m[32m '', Print, exec, grim -g "$(slurp -d)" - | wl-copy''[m
|
|||
|
|
[m
|
|||
|
|
"$mainMod, H, exec, ${./files/vim-hypr-nav.sh} l"[m
|
|||
|
|
"$mainMod, L, exec, ${./files/vim-hypr-nav.sh} r"[m
|
|||
|
|
[36m@@ -257,27 +241,16 @@[m [min[m
|
|||
|
|
"$mainMod, T, split-workspace, empty"[m
|
|||
|
|
"$mainMod, TAB, split-workspace, m+1"[m
|
|||
|
|
"$mainMod SHIFT, TAB, split-workspace, m-1"[m
|
|||
|
|
[31m- ][m
|
|||
|
|
[31m- ++ ([m
|
|||
|
|
[32m+[m[32m ] ++ ([m
|
|||
|
|
# workspaces[m
|
|||
|
|
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10}[m
|
|||
|
|
[31m- builtins.concatLists (builtins.genList[m
|
|||
|
|
[31m- ([m
|
|||
|
|
[31m- x:[m
|
|||
|
|
[31m- let[m
|
|||
|
|
[31m- ws =[m
|
|||
|
|
[31m- let[m
|
|||
|
|
[31m- c = (x + 1) / 10;[m
|
|||
|
|
[31m- in[m
|
|||
|
|
[31m- builtins.toString (x + 1 - (c * 10));[m
|
|||
|
|
[31m- in[m
|
|||
|
|
[31m- [[m
|
|||
|
|
[31m- "$mainMod, ${ws}, split-workspace, ${toString (x + 1)}"[m
|
|||
|
|
[31m- "$mainMod SHIFT, ${ws}, split-movetoworkspace, ${toString (x + 1)}"[m
|
|||
|
|
[31m- ][m
|
|||
|
|
[31m- )[m
|
|||
|
|
[31m- 10)[m
|
|||
|
|
[31m- );[m
|
|||
|
|
[32m+[m[32m builtins.concatLists (builtins.genList (x:[m
|
|||
|
|
[32m+[m[32m let[m
|
|||
|
|
[32m+[m[32m ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));[m
|
|||
|
|
[32m+[m[32m in [[m
|
|||
|
|
[32m+[m[32m "$mainMod, ${ws}, split-workspace, ${toString (x + 1)}"[m
|
|||
|
|
[32m+[m[32m "$mainMod SHIFT, ${ws}, split-movetoworkspace, ${toString (x + 1)}"[m
|
|||
|
|
[32m+[m[32m ]) 10));[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/lf/default.nix home/lf/default.nix[m
|
|||
|
|
[1mindex 804fe46..d16c150 100644[m
|
|||
|
|
[1m--- home/lf/default.nix[m
|
|||
|
|
[1m+++ home/lf/default.nix[m
|
|||
|
|
[36m@@ -19,8 +19,8 @@[m
|
|||
|
|
"<backspace2>" = "quit";[m
|
|||
|
|
"<c-e>" = "half-up";[m
|
|||
|
|
"." = "set hidden!";[m
|
|||
|
|
[31m- "o" = "$nvim -c \"lua require(\\\"oil\\\").open(\\\"$PWD\\\")\"";[m
|
|||
|
|
[31m- "-" = "$nvim -c \"lua require(\\\"oil\\\").open(\\\"$PWD\\\")\"";[m
|
|||
|
|
[32m+[m[32m "o" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';[m
|
|||
|
|
[32m+[m[32m "-" = ''$nvim -c "lua require(\"oil\").open(\"$PWD\")"'';[m
|
|||
|
|
"<enter>" = "open";[m
|
|||
|
|
"<c-t>" = ":jump <enter>";[m
|
|||
|
|
};[m
|
|||
|
|
[36m@@ -32,8 +32,6 @@[m
|
|||
|
|
}}[m
|
|||
|
|
'';[m
|
|||
|
|
};[m
|
|||
|
|
[31m- cmdKeybindings = {[m
|
|||
|
|
[31m- q = "quit";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m cmdKeybindings = { q = "quit"; };[m
|
|||
|
|
};[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/nixos.nix home/nixos.nix[m
|
|||
|
|
[1mindex ee6fc52..bfb8d58 100644[m
|
|||
|
|
[1m--- home/nixos.nix[m
|
|||
|
|
[1m+++ home/nixos.nix[m
|
|||
|
|
[36m@@ -2,25 +2,17 @@[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
imports = [[m
|
|||
|
|
[31m- (import ./common.nix { inherit inputs config pkgs; })[m
|
|||
|
|
[31m- (import ./hyprland { inherit inputs pkgs; })[m
|
|||
|
|
[31m- (import ./waybar { inherit inputs pkgs; })[m
|
|||
|
|
[31m- ./rofi[m
|
|||
|
|
[32m+[m[32m (import ./common.nix { inherit inputs config pkgs; })[m
|
|||
|
|
[32m+[m[32m (import ./hyprland { inherit inputs pkgs; })[m
|
|||
|
|
[32m+[m[32m (import ./waybar { inherit inputs pkgs; })[m
|
|||
|
|
[32m+[m[32m ./rofi[m
|
|||
|
|
];[m
|
|||
|
|
[m
|
|||
|
|
services.hyprpaper = {[m
|
|||
|
|
settings = {[m
|
|||
|
|
[31m- wallpaper = [[m
|
|||
|
|
[31m- "Virtual-1,${./hyprland/files/wallpaper.png}"[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m wallpaper = [ "Virtual-1,${./hyprland/files/wallpaper.png}" ];[m
|
|||
|
|
};[m
|
|||
|
|
};[m
|
|||
|
|
[m
|
|||
|
|
[31m- programs.waybar = {[m
|
|||
|
|
[31m- settings = {[m
|
|||
|
|
[31m- mainBar = {[m
|
|||
|
|
[31m- output = "Virtual-1";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m programs.waybar = { settings = { mainBar = { output = "Virtual-1"; }; }; };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/rofi/default.nix home/rofi/default.nix[m
|
|||
|
|
[1mindex dd65147..a5931ab 100644[m
|
|||
|
|
[1m--- home/rofi/default.nix[m
|
|||
|
|
[1m+++ home/rofi/default.nix[m
|
|||
|
|
[36m@@ -1,9 +1,7 @@[m
|
|||
|
|
{ config, pkgs, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
[31m- home.packages = with pkgs; [[m
|
|||
|
|
[31m- papirus-icon-theme[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m home.packages = with pkgs; [ papirus-icon-theme ];[m
|
|||
|
|
[m
|
|||
|
|
programs.rofi = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
[36m@@ -14,120 +12,115 @@[m
|
|||
|
|
kb-cancel = "Super_L+XF86Launch5,Escape";[m
|
|||
|
|
combi-hide-mode-prefix = true;[m
|
|||
|
|
};[m
|
|||
|
|
[31m- theme =[m
|
|||
|
|
[31m- let[m
|
|||
|
|
[31m- inherit (config.lib.formats.rasi) mkLiteral;[m
|
|||
|
|
[31m- in[m
|
|||
|
|
[31m- {[m
|
|||
|
|
[31m- "*" = {[m
|
|||
|
|
[31m- background = mkLiteral "#0f111a";[m
|
|||
|
|
[31m- foreground = mkLiteral "#f1f1f1";[m
|
|||
|
|
[31m- selected = mkLiteral "#0033a1";[m
|
|||
|
|
[31m- selected-text = mkLiteral "#ffffff";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "window" = {[m
|
|||
|
|
[31m- transparency = "real";[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- width = mkLiteral "800px";[m
|
|||
|
|
[31m- border-radius = mkLiteral "5px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "textbox-prompt-colon" = {[m
|
|||
|
|
[31m- expand = mkLiteral "false";[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- padding = mkLiteral "4px 0px 0px 6px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "inputbar" = {[m
|
|||
|
|
[31m- children = mkLiteral "[ textbox-prompt-colon, entry ]";[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- expand = mkLiteral "false";[m
|
|||
|
|
[31m- border = mkLiteral "0px 0px 0px 0px";[m
|
|||
|
|
[31m- border-radius = mkLiteral "0px";[m
|
|||
|
|
[31m- border-color = mkLiteral "@selected";[m
|
|||
|
|
[31m- margin = mkLiteral "0px 0px 0px 0px";[m
|
|||
|
|
[31m- padding = mkLiteral "0px 0px 4px 0px";[m
|
|||
|
|
[31m- position = mkLiteral "center";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "entry" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- placeholder-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- expand = mkLiteral "true";[m
|
|||
|
|
[31m- horizontal-align = mkLiteral "0";[m
|
|||
|
|
[31m- blink = mkLiteral "true";[m
|
|||
|
|
[31m- padding = mkLiteral "4px 0px 0px 4px";[m
|
|||
|
|
[31m- font = "SF Pro Rounded 25";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "case-indicator" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- spacing = mkLiteral "0";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "listview" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- columns = mkLiteral "1";[m
|
|||
|
|
[31m- spacing = mkLiteral "5px";[m
|
|||
|
|
[31m- cycle = mkLiteral "true";[m
|
|||
|
|
[31m- dynamic = mkLiteral "true";[m
|
|||
|
|
[31m- layout = mkLiteral "vertical";[m
|
|||
|
|
[31m- fixed-height = "true";[m
|
|||
|
|
[31m- lines = mkLiteral "5";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "mainbox" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- children = mkLiteral "[ inputbar, message, listview ]";[m
|
|||
|
|
[31m- spacing = mkLiteral "20px";[m
|
|||
|
|
[31m- padding = mkLiteral "20px 15px 15px 15px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "message" = {[m
|
|||
|
|
[31m- children = mkLiteral "[ textbox ]";[m
|
|||
|
|
[31m- border-radius = mkLiteral "5px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "textbox" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@selected";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- padding = mkLiteral "20px 6px 20px 80px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "element" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@background";[m
|
|||
|
|
[31m- text-color = mkLiteral "@foreground";[m
|
|||
|
|
[31m- orientation = mkLiteral "horizontal";[m
|
|||
|
|
[31m- border-radius = mkLiteral "4px";[m
|
|||
|
|
[31m- padding = mkLiteral "2px 2px 2px 2px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "element-text, element-icon" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "inherit";[m
|
|||
|
|
[31m- text-color = mkLiteral "inherit";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "element-icon" = {[m
|
|||
|
|
[31m- size = mkLiteral "40px";[m
|
|||
|
|
[31m- border = mkLiteral "10px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "element-text" = {[m
|
|||
|
|
[31m- padding = mkLiteral "20px 0px 0px 10px";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- "element selected" = {[m
|
|||
|
|
[31m- background-color = mkLiteral "@selected";[m
|
|||
|
|
[31m- text-color = mkLiteral "@selected-text";[m
|
|||
|
|
[31m- border = mkLiteral "0px";[m
|
|||
|
|
[31m- border-radius = mkLiteral "3px";[m
|
|||
|
|
[31m- border-color = mkLiteral "@selected";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m theme = let inherit (config.lib.formats.rasi) mkLiteral;[m
|
|||
|
|
[32m+[m[32m in {[m
|
|||
|
|
[32m+[m[32m "*" = {[m
|
|||
|
|
[32m+[m[32m background = mkLiteral "#0f111a";[m
|
|||
|
|
[32m+[m[32m foreground = mkLiteral "#f1f1f1";[m
|
|||
|
|
[32m+[m[32m selected = mkLiteral "#0033a1";[m
|
|||
|
|
[32m+[m[32m selected-text = mkLiteral "#ffffff";[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "window" = {[m
|
|||
|
|
[32m+[m[32m transparency = "real";[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m width = mkLiteral "800px";[m
|
|||
|
|
[32m+[m[32m border-radius = mkLiteral "5px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "textbox-prompt-colon" = {[m
|
|||
|
|
[32m+[m[32m expand = mkLiteral "false";[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "4px 0px 0px 6px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "inputbar" = {[m
|
|||
|
|
[32m+[m[32m children = mkLiteral "[ textbox-prompt-colon, entry ]";[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m expand = mkLiteral "false";[m
|
|||
|
|
[32m+[m[32m border = mkLiteral "0px 0px 0px 0px";[m
|
|||
|
|
[32m+[m[32m border-radius = mkLiteral "0px";[m
|
|||
|
|
[32m+[m[32m border-color = mkLiteral "@selected";[m
|
|||
|
|
[32m+[m[32m margin = mkLiteral "0px 0px 0px 0px";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "0px 0px 4px 0px";[m
|
|||
|
|
[32m+[m[32m position = mkLiteral "center";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "entry" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m placeholder-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m expand = mkLiteral "true";[m
|
|||
|
|
[32m+[m[32m horizontal-align = mkLiteral "0";[m
|
|||
|
|
[32m+[m[32m blink = mkLiteral "true";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "4px 0px 0px 4px";[m
|
|||
|
|
[32m+[m[32m font = "SF Pro Rounded 25";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "case-indicator" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m spacing = mkLiteral "0";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "listview" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m columns = mkLiteral "1";[m
|
|||
|
|
[32m+[m[32m spacing = mkLiteral "5px";[m
|
|||
|
|
[32m+[m[32m cycle = mkLiteral "true";[m
|
|||
|
|
[32m+[m[32m dynamic = mkLiteral "true";[m
|
|||
|
|
[32m+[m[32m layout = mkLiteral "vertical";[m
|
|||
|
|
[32m+[m[32m fixed-height = "true";[m
|
|||
|
|
[32m+[m[32m lines = mkLiteral "5";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "mainbox" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m children = mkLiteral "[ inputbar, message, listview ]";[m
|
|||
|
|
[32m+[m[32m spacing = mkLiteral "20px";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "20px 15px 15px 15px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "message" = {[m
|
|||
|
|
[32m+[m[32m children = mkLiteral "[ textbox ]";[m
|
|||
|
|
[32m+[m[32m border-radius = mkLiteral "5px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "textbox" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@selected";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "20px 6px 20px 80px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "element" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@background";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@foreground";[m
|
|||
|
|
[32m+[m[32m orientation = mkLiteral "horizontal";[m
|
|||
|
|
[32m+[m[32m border-radius = mkLiteral "4px";[m
|
|||
|
|
[32m+[m[32m padding = mkLiteral "2px 2px 2px 2px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "element-text, element-icon" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "inherit";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "inherit";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "element-icon" = {[m
|
|||
|
|
[32m+[m[32m size = mkLiteral "40px";[m
|
|||
|
|
[32m+[m[32m border = mkLiteral "10px";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "element-text" = { padding = mkLiteral "20px 0px 0px 10px"; };[m
|
|||
|
|
[32m+[m
|
|||
|
|
[32m+[m[32m "element selected" = {[m
|
|||
|
|
[32m+[m[32m background-color = mkLiteral "@selected";[m
|
|||
|
|
[32m+[m[32m text-color = mkLiteral "@selected-text";[m
|
|||
|
|
[32m+[m[32m border = mkLiteral "0px";[m
|
|||
|
|
[32m+[m[32m border-radius = mkLiteral "3px";[m
|
|||
|
|
[32m+[m[32m border-color = mkLiteral "@selected";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
};[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/ssh/default.nix home/ssh/default.nix[m
|
|||
|
|
[1mindex 4b8ebfb..4b800d1 100644[m
|
|||
|
|
[1m--- home/ssh/default.nix[m
|
|||
|
|
[1m+++ home/ssh/default.nix[m
|
|||
|
|
[36m@@ -1,66 +1,66 @@[m
|
|||
|
|
{ inputs, config, pkgs, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
[31m- programs.ssh = {[m
|
|||
|
|
[31m- enable = true;[m
|
|||
|
|
[31m- includes = ["gpulab_hosts_config"];[m
|
|||
|
|
[31m- matchBlocks = {[m
|
|||
|
|
[31m- mallorea = {[m
|
|||
|
|
[31m- host = "mallorea";[m
|
|||
|
|
[31m- hostname = "server.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "server";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- Mallorea = {[m
|
|||
|
|
[31m- host = "Mallorea";[m
|
|||
|
|
[31m- hostname = "server.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "server";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- Kell = {[m
|
|||
|
|
[31m- host = "Kell";[m
|
|||
|
|
[31m- hostname = "kell.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- kell = {[m
|
|||
|
|
[31m- host = "kell";[m
|
|||
|
|
[31m- hostname = "kell.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- Riva = {[m
|
|||
|
|
[31m- host = "Riva";[m
|
|||
|
|
[31m- hostname = "riva.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- riva = {[m
|
|||
|
|
[31m- host = "riva";[m
|
|||
|
|
[31m- hostname = "riva.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "user";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- Vault = {[m
|
|||
|
|
[31m- host = "Vault";[m
|
|||
|
|
[31m- hostname = "etienne.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "server";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- vault = {[m
|
|||
|
|
[31m- host = "vault";[m
|
|||
|
|
[31m- hostname = "etienne.thomasave.be";[m
|
|||
|
|
[31m- port = 22;[m
|
|||
|
|
[31m- user = "server";[m
|
|||
|
|
[31m- forwardAgent = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m programs.ssh = {[m
|
|||
|
|
[32m+[m[32m enable = true;[m
|
|||
|
|
[32m+[m[32m includes = [ "gpulab_hosts_config" ];[m
|
|||
|
|
[32m+[m[32m matchBlocks = {[m
|
|||
|
|
[32m+[m[32m mallorea = {[m
|
|||
|
|
[32m+[m[32m host = "mallorea";[m
|
|||
|
|
[32m+[m[32m hostname = "server.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "server";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m Mallorea = {[m
|
|||
|
|
[32m+[m[32m host = "Mallorea";[m
|
|||
|
|
[32m+[m[32m hostname = "server.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "server";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m Kell = {[m
|
|||
|
|
[32m+[m[32m host = "Kell";[m
|
|||
|
|
[32m+[m[32m hostname = "kell.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "user";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m kell = {[m
|
|||
|
|
[32m+[m[32m host = "kell";[m
|
|||
|
|
[32m+[m[32m hostname = "kell.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "user";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m Riva = {[m
|
|||
|
|
[32m+[m[32m host = "Riva";[m
|
|||
|
|
[32m+[m[32m hostname = "riva.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "user";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m riva = {[m
|
|||
|
|
[32m+[m[32m host = "riva";[m
|
|||
|
|
[32m+[m[32m hostname = "riva.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "user";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m Vault = {[m
|
|||
|
|
[32m+[m[32m host = "Vault";[m
|
|||
|
|
[32m+[m[32m hostname = "etienne.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "server";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m vault = {[m
|
|||
|
|
[32m+[m[32m host = "vault";[m
|
|||
|
|
[32m+[m[32m hostname = "etienne.thomasave.be";[m
|
|||
|
|
[32m+[m[32m port = 22;[m
|
|||
|
|
[32m+[m[32m user = "server";[m
|
|||
|
|
[32m+[m[32m forwardAgent = true;[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
};[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git home/waybar/default.nix home/waybar/default.nix[m
|
|||
|
|
[1mindex e509df7..fa1b436 100644[m
|
|||
|
|
[1m--- home/waybar/default.nix[m
|
|||
|
|
[1m+++ home/waybar/default.nix[m
|
|||
|
|
[36m@@ -1,7 +1,4 @@[m
|
|||
|
|
[31m-{ inputs[m
|
|||
|
|
[31m-, pkgs[m
|
|||
|
|
[31m-, ...[m
|
|||
|
|
[31m-}:[m
|
|||
|
|
[32m+[m[32m{ inputs, pkgs, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
programs.waybar = {[m
|
|||
|
|
[36m@@ -15,7 +12,18 @@[m
|
|||
|
|
# output = "DP-2"; # Fill in with host-specific config![m
|
|||
|
|
modules-left = [ "wlr/taskbar" ];[m
|
|||
|
|
modules-center = [ "hyprland/workspaces" ];[m
|
|||
|
|
[31m- modules-right = [ "tray" "wireplumber" "cpu#cpu2" "cpu" "memory" "custom/updates" "temperature" "battery" "clock" "clock#clock2" ];[m
|
|||
|
|
[32m+[m[32m modules-right = [[m
|
|||
|
|
[32m+[m[32m "tray"[m
|
|||
|
|
[32m+[m[32m "wireplumber"[m
|
|||
|
|
[32m+[m[32m "cpu#cpu2"[m
|
|||
|
|
[32m+[m[32m "cpu"[m
|
|||
|
|
[32m+[m[32m "memory"[m
|
|||
|
|
[32m+[m[32m "custom/updates"[m
|
|||
|
|
[32m+[m[32m "temperature"[m
|
|||
|
|
[32m+[m[32m "battery"[m
|
|||
|
|
[32m+[m[32m "clock"[m
|
|||
|
|
[32m+[m[32m "clock#clock2"[m
|
|||
|
|
[32m+[m[32m ];[m
|
|||
|
|
"wlr/taskbar" = {[m
|
|||
|
|
on-click = "activate";[m
|
|||
|
|
on-click-right = "close";[m
|
|||
|
|
[36m@@ -34,12 +42,8 @@[m
|
|||
|
|
warp-on-scroll = false;[m
|
|||
|
|
format = "{name}";[m
|
|||
|
|
};[m
|
|||
|
|
[31m- "hyprland/window" = {[m
|
|||
|
|
[31m- max-length = 50;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- tray = {[m
|
|||
|
|
[31m- spacing = 10;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m "hyprland/window" = { max-length = 50; };[m
|
|||
|
|
[32m+[m[32m tray = { spacing = 10; };[m
|
|||
|
|
"clock#clock2" = {[m
|
|||
|
|
timezone = "Europe/Brussels";[m
|
|||
|
|
format = "{:%H:%M:%S}";[m
|
|||
|
|
[36m@@ -61,8 +65,10 @@[m
|
|||
|
|
interval = 5;[m
|
|||
|
|
};[m
|
|||
|
|
"custom/updates" = {[m
|
|||
|
|
[31m- exec = "bash -c \"checkupdates | wc -l\"";[m
|
|||
|
|
[31m- on-click = "alacritty -e bash -c \"yay ; echo '\nDone, press any key to exit...' ; read\"";[m
|
|||
|
|
[32m+[m[32m exec = ''bash -c "checkupdates | wc -l"'';[m
|
|||
|
|
[32m+[m[32m on-click = ''[m
|
|||
|
|
[32m+[m[32m alacritty -e bash -c "yay ; echo '[m
|
|||
|
|
[32m+[m[32m Done, press any key to exit...' ; read"'';[m
|
|||
|
|
interval = 60;[m
|
|||
|
|
format = "{} ";[m
|
|||
|
|
};[m
|
|||
|
|
[1mdiff --git home/zsh/default.nix home/zsh/default.nix[m
|
|||
|
|
[1mindex d910b27..419344e 100644[m
|
|||
|
|
[1m--- home/zsh/default.nix[m
|
|||
|
|
[1m+++ home/zsh/default.nix[m
|
|||
|
|
[36m@@ -17,7 +17,8 @@[m
|
|||
|
|
BROWSER = "firefox";[m
|
|||
|
|
GPULAB_CERT = "${config.xdg.dataHome}/gpulab.pem";[m
|
|||
|
|
GPULAB_DEV = "False";[m
|
|||
|
|
[31m- GCC_COLORS = "error = '01;31:warning = '01;35:note = '01;36:caret = '01;32:locus = '01:quote = '01'";[m
|
|||
|
|
[32m+[m[32m GCC_COLORS =[m
|
|||
|
|
[32m+[m[32m "error = '01;31:warning = '01;35:note = '01;36:caret = '01;32:locus = '01:quote = '01'";[m
|
|||
|
|
ARCHFLAGS = "-arch x86_64";[m
|
|||
|
|
TERM = "screen-256color";[m
|
|||
|
|
PYTHONDONTWRITEBYTECODE = "1";[m
|
|||
|
|
[36m@@ -28,9 +29,7 @@[m
|
|||
|
|
enable = true;[m
|
|||
|
|
enableZshIntegration = true;[m
|
|||
|
|
};[m
|
|||
|
|
[31m- programs.fzf = {[m
|
|||
|
|
[31m- enable = true;[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m programs.fzf = { enable = true; };[m
|
|||
|
|
programs.zsh = {[m
|
|||
|
|
enable = true;[m
|
|||
|
|
enableCompletion = true;[m
|
|||
|
|
[36m@@ -62,17 +61,22 @@[m
|
|||
|
|
[m
|
|||
|
|
ll = "ls -lhat";[m
|
|||
|
|
ls = "ls --color=auto";[m
|
|||
|
|
[31m- lf = "cd \"\$(${pkgs.lf}/bin/lf -print-last-dir)\"";[m
|
|||
|
|
[32m+[m[32m lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';[m
|
|||
|
|
[m
|
|||
|
|
compress = "tar --use-compress-program = lbzip2 -cvf";[m
|
|||
|
|
[31m- wget = "wget --hsts-file = \"$XDG_DATA_HOME/wget-hsts\"";[m
|
|||
|
|
[32m+[m[32m wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';[m
|
|||
|
|
python = "python3";[m
|
|||
|
|
[31m- v = "nvim -c ':lua require(\"oil\").open()' && cd \"\$(cat /tmp/oil_dir 2> /dev/null || pwd)\"";[m
|
|||
|
|
[31m- cpr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1";[m
|
|||
|
|
[31m- mvr = "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1 --remove-source-files";[m
|
|||
|
|
[31m- rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";[m
|
|||
|
|
[31m- ag = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";[m
|
|||
|
|
[31m- push = "git add -A && git commit -m \"`date`\" && git push";[m
|
|||
|
|
[32m+[m[32m v = ''[m
|
|||
|
|
[32m+[m[32m nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';[m
|
|||
|
|
[32m+[m[32m cpr =[m
|
|||
|
|
[32m+[m[32m "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1";[m
|
|||
|
|
[32m+[m[32m mvr =[m
|
|||
|
|
[32m+[m[32m "rsync --archive -hh --partial --info = stats1,progress2 --modify-window = 1 --remove-source-files";[m
|
|||
|
|
[32m+[m[32m rg =[m
|
|||
|
|
[32m+[m[32m "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";[m
|
|||
|
|
[32m+[m[32m ag =[m
|
|||
|
|
[32m+[m[32m "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";[m
|
|||
|
|
[32m+[m[32m push = ''git add -A && git commit -m "`date`" && git push'';[m
|
|||
|
|
reset = "tput reset";[m
|
|||
|
|
};[m
|
|||
|
|
history.size = 10000000;[m
|
|||
|
|
[1mdiff --git hosts/Kell/default.nix hosts/Kell/default.nix[m
|
|||
|
|
[1mindex 3ff7f53..a4bcf8d 100644[m
|
|||
|
|
[1m--- hosts/Kell/default.nix[m
|
|||
|
|
[1m+++ hosts/Kell/default.nix[m
|
|||
|
|
[36m@@ -1,64 +1,59 @@[m
|
|||
|
|
[31m-{inputs, pkgs, ...}:[m
|
|||
|
|
[32m+[m[32m{ inputs, pkgs, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
services.pcscd.enable = true;[m
|
|||
|
|
services.udev.packages = [ pkgs.yubikey-personalization ];[m
|
|||
|
|
[31m- services.logind.extraConfig = ''[m
|
|||
|
|
[32m+[m[32m services.logind.extraConfig = ''[m
|
|||
|
|
# don’t shutdown when power button is short-pressed[m
|
|||
|
|
HandlePowerKey=suspend[m
|
|||
|
|
'';[m
|
|||
|
|
[m
|
|||
|
|
[32m+[m[32m # Calendar[m
|
|||
|
|
[32m+[m[32m programs.dconf.enable = true;[m
|
|||
|
|
[32m+[m[32m services.gnome.evolution-data-server.enable = true;[m
|
|||
|
|
[32m+[m[32m services.gnome.gnome-online-accounts.enable = true;[m
|
|||
|
|
[32m+[m[32m services.gnome.gnome-keyring.enable = true;[m
|
|||
|
|
[32m+[m[32m environment.systemPackages = with pkgs; [ wireguard-tools ];[m
|
|||
|
|
[32m+[m[32m # Add the server using gnome-online-accounts:[m
|
|||
|
|
[32m+[m[32m # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"[m
|
|||
|
|
[32m+[m[32m # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.[m
|
|||
|
|
[m
|
|||
|
|
[31m- # Calendar[m
|
|||
|
|
[31m- programs.dconf.enable = true;[m
|
|||
|
|
[31m- services.gnome.evolution-data-server.enable = true;[m
|
|||
|
|
[31m- services.gnome.gnome-online-accounts.enable = true;[m
|
|||
|
|
[31m- services.gnome.gnome-keyring.enable = true;[m
|
|||
|
|
[31m- environment.systemPackages = with pkgs; [[m
|
|||
|
|
[31m- wireguard-tools[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[31m- # Add the server using gnome-online-accounts:[m
|
|||
|
|
[31m- # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"[m
|
|||
|
|
[31m- # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.[m
|
|||
|
|
[31m-[m
|
|||
|
|
[31m- networking.wg-quick.interfaces = {[m
|
|||
|
|
[31m- wg0 = {[m
|
|||
|
|
[31m- address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ];[m
|
|||
|
|
[31m- dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];[m
|
|||
|
|
[31m- privateKeyFile = "/home/user/.secrets/Wireguard/wg0.key";[m
|
|||
|
|
[31m- listenPort = 51820;[m
|
|||
|
|
[31m- peers = [[m
|
|||
|
|
[31m- {[m
|
|||
|
|
[31m- publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";[m
|
|||
|
|
[31m- allowedIPs = [ "10.0.0.1/8" ];[m
|
|||
|
|
[31m- endpoint = "192.168.1.1:13231";[m
|
|||
|
|
[31m- }[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- fileSystems."/home/server" = {[m
|
|||
|
|
[31m- device = "192.168.1.2:/home/server";[m
|
|||
|
|
[31m- fsType = "nfs";[m
|
|||
|
|
[31m- options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- fileSystems."/home/user/Workspace" = {[m
|
|||
|
|
[31m- device = "192.168.1.2:/home/server/Workspace";[m
|
|||
|
|
[31m- fsType = "nfs";[m
|
|||
|
|
[31m- options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- fileSystems."/home/user/Documents" = {[m
|
|||
|
|
[31m- device = "192.168.1.2:/home/server/Storage/Thomas/Documents";[m
|
|||
|
|
[31m- fsType = "nfs";[m
|
|||
|
|
[31m- options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- fileSystems."/home/user/Pictures" = {[m
|
|||
|
|
[31m- device = "192.168.1.2:/home/server/Storage/Thomas/Pictures";[m
|
|||
|
|
[31m- fsType = "nfs";[m
|
|||
|
|
[31m- options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[31m- fileSystems."/home/user/Videos" = {[m
|
|||
|
|
[31m- device = "192.168.1.2:/home/server/Storage/Thomas/Videos";[m
|
|||
|
|
[31m- fsType = "nfs";[m
|
|||
|
|
[31m- options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m networking.wg-quick.interfaces = {[m
|
|||
|
|
[32m+[m[32m wg0 = {[m
|
|||
|
|
[32m+[m[32m address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ];[m
|
|||
|
|
[32m+[m[32m dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];[m
|
|||
|
|
[32m+[m[32m privateKeyFile = "/home/user/.secrets/Wireguard/wg0.key";[m
|
|||
|
|
[32m+[m[32m listenPort = 51820;[m
|
|||
|
|
[32m+[m[32m peers = [{[m
|
|||
|
|
[32m+[m[32m publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";[m
|
|||
|
|
[32m+[m[32m allowedIPs = [ "10.0.0.1/8" ];[m
|
|||
|
|
[32m+[m[32m endpoint = "192.168.1.1:13231";[m
|
|||
|
|
[32m+[m[32m }];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m fileSystems."/home/server" = {[m
|
|||
|
|
[32m+[m[32m device = "192.168.1.2:/home/server";[m
|
|||
|
|
[32m+[m[32m fsType = "nfs";[m
|
|||
|
|
[32m+[m[32m options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m fileSystems."/home/user/Workspace" = {[m
|
|||
|
|
[32m+[m[32m device = "192.168.1.2:/home/server/Workspace";[m
|
|||
|
|
[32m+[m[32m fsType = "nfs";[m
|
|||
|
|
[32m+[m[32m options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m fileSystems."/home/user/Documents" = {[m
|
|||
|
|
[32m+[m[32m device = "192.168.1.2:/home/server/Storage/Thomas/Documents";[m
|
|||
|
|
[32m+[m[32m fsType = "nfs";[m
|
|||
|
|
[32m+[m[32m options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m fileSystems."/home/user/Pictures" = {[m
|
|||
|
|
[32m+[m[32m device = "192.168.1.2:/home/server/Storage/Thomas/Pictures";[m
|
|||
|
|
[32m+[m[32m fsType = "nfs";[m
|
|||
|
|
[32m+[m[32m options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[32m+[m[32m fileSystems."/home/user/Videos" = {[m
|
|||
|
|
[32m+[m[32m device = "192.168.1.2:/home/server/Storage/Thomas/Videos";[m
|
|||
|
|
[32m+[m[32m fsType = "nfs";[m
|
|||
|
|
[32m+[m[32m options = [ "x-systemd.automount" "noauto" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git hosts/Kell/hardware-configuration.nix hosts/Kell/hardware-configuration.nix[m
|
|||
|
|
[1mindex 90cea7a..2d2ca47 100644[m
|
|||
|
|
[1m--- hosts/Kell/hardware-configuration.nix[m
|
|||
|
|
[1m+++ hosts/Kell/hardware-configuration.nix[m
|
|||
|
|
[36m@@ -4,25 +4,24 @@[m
|
|||
|
|
{ config, lib, pkgs, modulesPath, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
[31m- imports =[m
|
|||
|
|
[31m- [ (modulesPath + "/installer/scan/not-detected.nix")[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];[m
|
|||
|
|
[m
|
|||
|
|
[31m- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];[m
|
|||
|
|
[32m+[m[32m boot.initrd.availableKernelModules =[m
|
|||
|
|
[32m+[m[32m [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];[m
|
|||
|
|
boot.initrd.kernelModules = [ ];[m
|
|||
|
|
boot.kernelModules = [ "kvm-amd" ];[m
|
|||
|
|
boot.extraModulePackages = [ ];[m
|
|||
|
|
[m
|
|||
|
|
[31m- fileSystems."/" =[m
|
|||
|
|
[31m- { device = "/dev/disk/by-uuid/feef066a-9abf-418d-a39e-603c406a72ff";[m
|
|||
|
|
[31m- fsType = "ext4";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m fileSystems."/" = {[m
|
|||
|
|
[32m+[m[32m device = "/dev/disk/by-uuid/feef066a-9abf-418d-a39e-603c406a72ff";[m
|
|||
|
|
[32m+[m[32m fsType = "ext4";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
[31m- fileSystems."/boot" =[m
|
|||
|
|
[31m- { device = "/dev/disk/by-uuid/0D9B-B227";[m
|
|||
|
|
[31m- fsType = "vfat";[m
|
|||
|
|
[31m- options = [ "fmask=0077" "dmask=0077" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m fileSystems."/boot" = {[m
|
|||
|
|
[32m+[m[32m device = "/dev/disk/by-uuid/0D9B-B227";[m
|
|||
|
|
[32m+[m[32m fsType = "vfat";[m
|
|||
|
|
[32m+[m[32m options = [ "fmask=0077" "dmask=0077" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
swapDevices = [ ];[m
|
|||
|
|
[m
|
|||
|
|
[36m@@ -35,5 +34,6 @@[m
|
|||
|
|
# networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;[m
|
|||
|
|
[m
|
|||
|
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";[m
|
|||
|
|
[31m- hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;[m
|
|||
|
|
[32m+[m[32m hardware.cpu.amd.updateMicrocode =[m
|
|||
|
|
[32m+[m[32m lib.mkDefault config.hardware.enableRedistributableFirmware;[m
|
|||
|
|
}[m
|
|||
|
|
[1mdiff --git hosts/nixos/default.nix hosts/nixos/default.nix[m
|
|||
|
|
[1mindex 2c63c08..ffcd441 100644[m
|
|||
|
|
[1m--- hosts/nixos/default.nix[m
|
|||
|
|
[1m+++ hosts/nixos/default.nix[m
|
|||
|
|
[36m@@ -1,2 +1 @@[m
|
|||
|
|
[31m-{[m
|
|||
|
|
[31m-}[m
|
|||
|
|
[32m+[m[32m{ }[m
|
|||
|
|
[1mdiff --git hosts/nixos/hardware-configuration.nix hosts/nixos/hardware-configuration.nix[m
|
|||
|
|
[1mindex ca457b2..a88f30f 100644[m
|
|||
|
|
[1m--- hosts/nixos/hardware-configuration.nix[m
|
|||
|
|
[1m+++ hosts/nixos/hardware-configuration.nix[m
|
|||
|
|
[36m@@ -4,28 +4,24 @@[m
|
|||
|
|
{ config, lib, pkgs, modulesPath, ... }:[m
|
|||
|
|
[m
|
|||
|
|
{[m
|
|||
|
|
[31m- imports =[m
|
|||
|
|
[31m- [[m
|
|||
|
|
[31m- (modulesPath + "/profiles/qemu-guest.nix")[m
|
|||
|
|
[31m- ];[m
|
|||
|
|
[32m+[m[32m imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];[m
|
|||
|
|
[m
|
|||
|
|
[31m- boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];[m
|
|||
|
|
[32m+[m[32m boot.initrd.availableKernelModules =[m
|
|||
|
|
[32m+[m[32m [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];[m
|
|||
|
|
boot.initrd.kernelModules = [ ];[m
|
|||
|
|
boot.kernelModules = [ "kvm-amd" ];[m
|
|||
|
|
boot.extraModulePackages = [ ];[m
|
|||
|
|
[m
|
|||
|
|
[31m- fileSystems."/" =[m
|
|||
|
|
[31m- {[m
|
|||
|
|
[31m- device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff";[m
|
|||
|
|
[31m- fsType = "ext4";[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m fileSystems."/" = {[m
|
|||
|
|
[32m+[m[32m device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff";[m
|
|||
|
|
[32m+[m[32m fsType = "ext4";[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
[31m- fileSystems."/boot" =[m
|
|||
|
|
[31m- {[m
|
|||
|
|
[31m- device = "/dev/disk/by-uuid/9F3C-9F3B";[m
|
|||
|
|
[31m- fsType = "vfat";[m
|
|||
|
|
[31m- options = [ "fmask=0077" "dmask=0077" ];[m
|
|||
|
|
[31m- };[m
|
|||
|
|
[32m+[m[32m fileSystems."/boot" = {[m
|
|||
|
|
[32m+[m[32m device = "/dev/disk/by-uuid/9F3C-9F3B";[m
|
|||
|
|
[32m+[m[32m fsType = "vfat";[m
|
|||
|
|
[32m+[m[32m options = [ "fmask=0077" "dmask=0077" ];[m
|
|||
|
|
[32m+[m[32m };[m
|
|||
|
|
[m
|
|||
|
|
swapDevices = [ ];[m
|
|||
|
|
[m
|