convinience: builders, cache, github api
This commit is contained in:
parent
935d32f35f
commit
6cdcafb03d
|
@ -70,7 +70,8 @@
|
||||||
home-manager.nixosModules.home-manager {
|
home-manager.nixosModules.home-manager {
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users."gunalx" = import ./home/full.nix;
|
home-manager.users."gunalx" = import ./home/gunalx/full.nix;
|
||||||
|
home-manager.users."root" = import ./home/root/base.nix;
|
||||||
home-manager.backupFileExtension = "bac";
|
home-manager.backupFileExtension = "bac";
|
||||||
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
|
home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
|
||||||
}
|
}
|
||||||
|
@ -140,11 +141,11 @@
|
||||||
|
|
||||||
|
|
||||||
devShells.x86_64-linux = {
|
devShells.x86_64-linux = {
|
||||||
default = nixpkgs.legacyPackages.x86_64-linux.callPackage ./home/shell.nix { };
|
default = nixpkgs.legacyPackages.x86_64-linux.callPackage ./home/gunalx/shell.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.aarch64-linux = {
|
devShells.aarch64-linux = {
|
||||||
default = nixpkgs.legacyPackages.aarch64-linux.callPackage ./home/shell.nix { };
|
default = nixpkgs.legacyPackages.aarch64-linux.callPackage ./home/gunalx/shell.nix { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,96 @@
|
||||||
|
{ pkgs, lib, config, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
];
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
openssh
|
||||||
|
sshfs
|
||||||
|
];
|
||||||
|
|
||||||
|
services.ssh-agent.enable = true;
|
||||||
|
|
||||||
|
programs.ssh = {
|
||||||
|
enable = true;
|
||||||
|
compression = true;
|
||||||
|
|
||||||
|
matchBlocks = {
|
||||||
|
"*" = {
|
||||||
|
|
||||||
|
identityFile = [
|
||||||
|
"~/.ssh/nixos"
|
||||||
|
"~/.ssh/id_ed25519"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
"*.pvv.ntnu.no" = {
|
||||||
|
user="adriangl";
|
||||||
|
};
|
||||||
|
"*.ntnu.no !login.pvv.ntnu.no" = {
|
||||||
|
user="adriangl";
|
||||||
|
proxyJump="login.pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
"snotra" = {
|
||||||
|
user="adriangl";
|
||||||
|
proxyJump="adriangl@login.pvv.ntnu.no";
|
||||||
|
hostname="snotra.idi.ntnu.no";
|
||||||
|
};
|
||||||
|
|
||||||
|
#pbsds
|
||||||
|
|
||||||
|
"garp.pbsds.net" = {
|
||||||
|
user="adrlau";
|
||||||
|
proxyJump = "login.pvv.ntnu.no";
|
||||||
|
extraOptions = {
|
||||||
|
StrictHostKeyChecking = "no";
|
||||||
|
UserKnownHostsFile = "/dev/null";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"bolle.pbsds.net" = {
|
||||||
|
user="adrlau";
|
||||||
|
proxyJump = "login.pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
|
||||||
|
#pvv
|
||||||
|
"pvv" = {
|
||||||
|
user="adriangl";
|
||||||
|
hostname="login.pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
"isvegg" = {
|
||||||
|
user="adriangl";
|
||||||
|
hostname="isvegg.pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
|
||||||
|
#home
|
||||||
|
"aragon" = {
|
||||||
|
port = 6969;
|
||||||
|
user="gunalx";
|
||||||
|
hostname="100.74.34.149";
|
||||||
|
};
|
||||||
|
|
||||||
|
"galadriel" = {
|
||||||
|
port = 6969;
|
||||||
|
user="gunalx";
|
||||||
|
hostname="100.84.215.84";
|
||||||
|
};
|
||||||
|
|
||||||
|
"gandalf" = {
|
||||||
|
port = 6969;
|
||||||
|
user="gunalx";
|
||||||
|
hostname="100.124.183.16";
|
||||||
|
};
|
||||||
|
|
||||||
|
"elrond" = {
|
||||||
|
port = 6969;
|
||||||
|
user="gunalx";
|
||||||
|
hostname="100.101.17.39 ";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = "";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./sshconfig.nix
|
../common/sshconfig.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.nix-index = {
|
programs.nix-index = {
|
|
@ -0,0 +1,162 @@
|
||||||
|
{ pkgs, lib, config, ... }:
|
||||||
|
let
|
||||||
|
im = config.i18n.inputMethod;
|
||||||
|
cfg = im.fcitx5;
|
||||||
|
fcitx5Package = pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
|
||||||
|
in
|
||||||
|
{
|
||||||
|
i18n.inputMethod = {
|
||||||
|
enabled = "fcitx5";
|
||||||
|
fcitx5.addons = with pkgs; [
|
||||||
|
fcitx5-mozc
|
||||||
|
fcitx5-gtk
|
||||||
|
fcitx5-chinese-addons
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
xdg.configFile = let
|
||||||
|
format = pkgs.formats.iniWithGlobalSection { };
|
||||||
|
in {
|
||||||
|
"fcitx5/profile" = {
|
||||||
|
force = true;
|
||||||
|
source = format.generate "fcitx5-profile" {
|
||||||
|
sections = {
|
||||||
|
"Groups/0" = {
|
||||||
|
Name = "Default";
|
||||||
|
"Default Layout" = "us";
|
||||||
|
DefaultIM = "mozc";
|
||||||
|
};
|
||||||
|
"Groups/0/Items/0" = {
|
||||||
|
Name = "keyboard-us";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
"Groups/0/Items/1" = {
|
||||||
|
Name = "keyboard-no";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
"Groups/0/Items/2" = {
|
||||||
|
Name = "mozc";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
"Groups/1" = {
|
||||||
|
Name = "Default";
|
||||||
|
"Default Layout" = "jp";
|
||||||
|
DefaultIM = "mozc";
|
||||||
|
};
|
||||||
|
"Groups/1/Items/0" = {
|
||||||
|
Name = "keyboard-us";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
"Groups/1/Items/1" = {
|
||||||
|
Name = "keyboard-no";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
"Groups/1/Items/2" = {
|
||||||
|
Name = "mozc";
|
||||||
|
Layout = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
GroupOrder = {
|
||||||
|
"0" = "Default";
|
||||||
|
"1" = "Secondary";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"fcitx5/config".source = format.generate "fcitx5-config" {
|
||||||
|
sections = {
|
||||||
|
Hotkey = {
|
||||||
|
# Enumerate when press trigger key repeatedly
|
||||||
|
EnumerateWithTriggerKeys = "True";
|
||||||
|
# Temporally switch between first and current Input Method
|
||||||
|
AltTriggerKeys = "";
|
||||||
|
# Enumerate Input Method Forward
|
||||||
|
EnumerateForwardKeys = "";
|
||||||
|
# Enumerate Input Method Backward
|
||||||
|
EnumerateBackwardKeys = "";
|
||||||
|
# Skip first input method while enumerating
|
||||||
|
EnumerateSkipFirst = "False";
|
||||||
|
};
|
||||||
|
|
||||||
|
"Hotkey/TriggerKeys" = {
|
||||||
|
"0" = "Control+space";
|
||||||
|
"1" = "Zenkaku_Hankaku";
|
||||||
|
"2" = "Hangul";
|
||||||
|
};
|
||||||
|
|
||||||
|
"Hotkey/EnumerateGroupForwardKeys"."0" = "Super+space";
|
||||||
|
"Hotkey/EnumerateGroupBackwardKeys"."0" = "Shift+Super+space";
|
||||||
|
"Hotkey/ActivateKeys"."0" = "Hangul_Hanja";
|
||||||
|
"Hotkey/DeactivateKeys"."0" = "Hangul_Romaja";
|
||||||
|
"Hotkey/PrevPage"."0" = "Up";
|
||||||
|
"Hotkey/NextPage"."0" = "Down";
|
||||||
|
"Hotkey/PrevCandidate"."0" = "Shift+Tab";
|
||||||
|
"Hotkey/NextCandidate"."0" = "Tab";
|
||||||
|
"Hotkey/TogglePreedit"."0" = "Control+Alt+P";
|
||||||
|
|
||||||
|
Behaviour = {
|
||||||
|
# Active By Default
|
||||||
|
ActiveByDefault = "False";
|
||||||
|
# Share Input State
|
||||||
|
ShareInputState = "All";
|
||||||
|
# Show preedit in application
|
||||||
|
PreeditEnabledByDefault = "True";
|
||||||
|
# Show Input Method Information when switch input method
|
||||||
|
ShowInputMethodInformation = "True";
|
||||||
|
# Show Input Method Information when changing focus
|
||||||
|
showInputMethodInformationWhenFocusIn = "False";
|
||||||
|
# Show compact input method information
|
||||||
|
CompactInputMethodInformation = "True";
|
||||||
|
# Show first input method information
|
||||||
|
ShowFirstInputMethodInformation = "True";
|
||||||
|
# Default page size
|
||||||
|
DefaultPageSize = 5;
|
||||||
|
# Override Xkb Option
|
||||||
|
OverrideXkbOption = "False";
|
||||||
|
# Custom Xkb Option
|
||||||
|
CustomXkbOption = "";
|
||||||
|
# Force Enabled Addons
|
||||||
|
EnabledAddons = "";
|
||||||
|
# Force Disabled Addons
|
||||||
|
DisabledAddons = "";
|
||||||
|
# Preload input method to be used by default
|
||||||
|
PreloadInputMethod = "True";
|
||||||
|
# Allow input method in the password field
|
||||||
|
AllowInputMethodForPassword = "False";
|
||||||
|
# Show preedit text when typing password
|
||||||
|
ShowPreeditForPassword = "False";
|
||||||
|
# Interval of saving user data in minutes
|
||||||
|
AutoSavePeriod = 30;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" {
|
||||||
|
globalSection = {
|
||||||
|
Theme = "Material-Color";
|
||||||
|
PerScreenDPI = "True";
|
||||||
|
# Font = "";
|
||||||
|
"Vertical Candidate List" = "True";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
xdg.dataFile."fcitx5/themes/Material-Color" = {
|
||||||
|
recursive = true;
|
||||||
|
source = "${pkgs.fcitx5-material-color}/share/fcitx5/themes/Material-Color-teal";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.user.services.fcitx5-daemon = {
|
||||||
|
Service.Restart="on-failure";
|
||||||
|
Service.ExecStart = lib.mkForce "${fcitx5Package}/bin/fcitx5";
|
||||||
|
Service.ExecReload = "/bin/kill -HUP $MAINPID";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -14,6 +14,7 @@ in
|
||||||
./waybar.nix
|
./waybar.nix
|
||||||
./foot.nix
|
./foot.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
|
./fcitx5.nix
|
||||||
./kanshi.nix
|
./kanshi.nix
|
||||||
./swaylock.nix
|
./swaylock.nix
|
||||||
#./assets/wallpapers
|
#./assets/wallpapers
|
||||||
|
@ -25,7 +26,8 @@ in
|
||||||
#];
|
#];
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
libsForQt5.qt5ct
|
#wl-copy
|
||||||
|
libsForQt5.qt5ct
|
||||||
qt6Packages.qt6ct
|
qt6Packages.qt6ct
|
||||||
pass-wayland
|
pass-wayland
|
||||||
wev
|
wev
|
||||||
|
@ -71,6 +73,9 @@ in
|
||||||
bemoji
|
bemoji
|
||||||
fuzzel
|
fuzzel
|
||||||
|
|
||||||
|
#for emoji picker
|
||||||
|
emote
|
||||||
|
unicode-emoji
|
||||||
|
|
||||||
#screenshots
|
#screenshots
|
||||||
grim
|
grim
|
||||||
|
@ -262,8 +267,10 @@ in {
|
||||||
"${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
|
"${cfg.config.modifier}+f11" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
|
||||||
"${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
|
"${cfg.config.modifier}+Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/\"screenshot-`date +%F-%T`\".png";
|
||||||
"${cfg.config.modifier}+m" = "exec ${idlelock}";
|
"${cfg.config.modifier}+m" = "exec ${idlelock}";
|
||||||
|
##emoji piacker
|
||||||
|
"${cfg.config.modifier}+period" = "exec emote";
|
||||||
#"ctrl+space" = "exec xkb_switch_layout next"; #TODO:verify
|
#"ctrl+space" = "exec xkb_switch_layout next"; #TODO:verify
|
||||||
"${cfg.config.modifier}+tab" = "workspace next";
|
"${cfg.config.modifier}+tab" = "${menu}";
|
||||||
"Alt+tab" = "workspace back_and_forth";
|
"Alt+tab" = "workspace back_and_forth";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -273,9 +280,9 @@ in {
|
||||||
xkb_capslock disabled
|
xkb_capslock disabled
|
||||||
xkb_numlock enabled
|
xkb_numlock enabled
|
||||||
|
|
||||||
xkb_layout no,us
|
xkb_layout us,no
|
||||||
xkb_options winkeys,
|
xkb_options ,
|
||||||
xkb_options grp:ctrl_space_toggle
|
xkb_options grp:win_space_toggle
|
||||||
xkb_numlock enabled # enable numlock when logging in
|
xkb_numlock enabled # enable numlock when logging in
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -295,12 +302,12 @@ in {
|
||||||
###client.unfocused #${palette.base0D} #${palette.base03} #${palette.base05} #${palette.base0D} #${palette.base00}
|
###client.unfocused #${palette.base0D} #${palette.base03} #${palette.base05} #${palette.base0D} #${palette.base00}
|
||||||
###client.urgent #${palette.base0D} #${palette.base0D} #${palette.base03} #${palette.base0D} #${palette.base00}
|
###client.urgent #${palette.base0D} #${palette.base0D} #${palette.base03} #${palette.base0D} #${palette.base00}
|
||||||
|
|
||||||
#### window decorations
|
# # window decorations
|
||||||
#### class border background text indicator child_border
|
# # class border background text indicator child_border
|
||||||
###client.focused #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff
|
# client.focused #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff
|
||||||
###client.focused_inactive #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff
|
# client.focused_inactive #80a0ff #303030 #c6c6c6 #80a0ff #80a0ff
|
||||||
###client.unfocused #80a0ff #080808 #c6c6c6 #80a0ff #303030
|
# client.unfocused #80a0ff #080808 #c6c6c6 #80a0ff #303030
|
||||||
###client.urgent #80a0ff #80a0ff #080808 #80a0ff
|
# client.urgent #80a0ff #80a0ff #080808 #80a0ff
|
||||||
|
|
||||||
# window decorations
|
# window decorations
|
||||||
# class border background text indicator child_border
|
# class border background text indicator child_border
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
|
@ -0,0 +1,82 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../common/sshconfig.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.nix-index = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs = {
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
allowUnfreePredicate = (_: true);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.bash = {
|
||||||
|
enable = true;
|
||||||
|
shellAliases = {
|
||||||
|
"rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade";
|
||||||
|
"nixedit" = "vim /etc/nixos/nix-dotfiles/.";
|
||||||
|
"nixdir" = "cd /etc/nixos/nix-dotfiles";
|
||||||
|
|
||||||
|
|
||||||
|
"," = "comma ";
|
||||||
|
|
||||||
|
"gst" = "git status";
|
||||||
|
"gsw" = "git switch";
|
||||||
|
"gcm" = "git commit -m ";
|
||||||
|
"gca" = "git commit --amend";
|
||||||
|
"gaa" = "git add -A";
|
||||||
|
"gb" = "git branch";
|
||||||
|
|
||||||
|
"sl" = "eza";
|
||||||
|
"ls" = "eza";
|
||||||
|
"lls" = "ls";
|
||||||
|
"la" = "eza -la";
|
||||||
|
"tree" = "eza -T";
|
||||||
|
"neofetch" = "fastfetch";
|
||||||
|
};
|
||||||
|
historyControl = ["ignoredups" "ignorespace" "erasedups"];
|
||||||
|
historyIgnore = [ "ls" "cd" "exit" "cd .." ".." "la"];
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
bottom
|
||||||
|
htop
|
||||||
|
fastfetch
|
||||||
|
eza
|
||||||
|
ripgrep
|
||||||
|
foot.terminfo
|
||||||
|
comma
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
extraConfig = {
|
||||||
|
pull.rebase = true;
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
color.ui = "auto";
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
lfs.enable = true;
|
||||||
|
user = {
|
||||||
|
name = "Adrian G L";
|
||||||
|
email = "adrian@lauterer.it";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
ignores = [
|
||||||
|
"*~"
|
||||||
|
"*.swp"
|
||||||
|
".DS_Store"
|
||||||
|
".vscode"
|
||||||
|
"*__PYCACHE__*"
|
||||||
|
"*__pycache__*"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
home.stateVersion = "23.05";
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
nerdfonts
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-cjk
|
||||||
|
noto-fonts-emoji
|
||||||
|
liberation_ttf
|
||||||
|
fira-code
|
||||||
|
fira-code-symbols
|
||||||
|
nerdfonts
|
||||||
|
ubuntu_font_family
|
||||||
|
zpix-pixel-font
|
||||||
|
_0xproto
|
||||||
|
font-awesome
|
||||||
|
font-awesome_5
|
||||||
|
font-awesome_4
|
||||||
|
|
||||||
|
];
|
||||||
|
|
||||||
|
fonts.fontconfig.enable = true;
|
||||||
|
fonts.fontconfig.defaultFonts = {
|
||||||
|
emoji = ["noto-fonts-emoji font-awesome"];
|
||||||
|
monospace = ["0xproto" "zpix" "fira-code"];
|
||||||
|
serif = [ "Noto Serif" "Source Han Serif" ];
|
||||||
|
sansSerif = [ "Noto Sans" "Source Han Sans" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
{ pkgs, lib, config, ... }:
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
foot
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.foot.enable = true;
|
||||||
|
programs.foot.settings = {
|
||||||
|
|
||||||
|
main = {
|
||||||
|
term = "xterm-256color";
|
||||||
|
font = "0xproto:size=12";
|
||||||
|
#dpi-aware = "yes";
|
||||||
|
};
|
||||||
|
mouse = {
|
||||||
|
hide-when-typing = "yes";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
colors = {
|
||||||
|
alpha = "0.7";
|
||||||
|
#set based on https://github.com/tinted-theming/base16-foot/blob/main/colors/base16-apathy.ini and https://github.com/tinted-theming/base16-schemes/blob/main/apathy.yaml
|
||||||
|
|
||||||
|
foreground = "${config.colorScheme.palette.base05}";
|
||||||
|
background = "${config.colorScheme.palette.base00}";
|
||||||
|
|
||||||
|
regular0 = "${config.colorScheme.palette.base00}";
|
||||||
|
regular1 = "${config.colorScheme.palette.base08}";
|
||||||
|
regular2 = "${config.colorScheme.palette.base0B}";
|
||||||
|
regular3 = "${config.colorScheme.palette.base0A}";
|
||||||
|
regular4 = "${config.colorScheme.palette.base0D}";
|
||||||
|
regular5 = "${config.colorScheme.palette.base0E}";
|
||||||
|
regular6 = "${config.colorScheme.palette.base0C}";
|
||||||
|
regular7 = "${config.colorScheme.palette.base05}";
|
||||||
|
|
||||||
|
bright0 = "${config.colorScheme.palette.base03}";
|
||||||
|
bright1 = "${config.colorScheme.palette.base08}";
|
||||||
|
bright2 = "${config.colorScheme.palette.base0B}";
|
||||||
|
bright3 = "${config.colorScheme.palette.base0A}";
|
||||||
|
bright4 = "${config.colorScheme.palette.base0D}";
|
||||||
|
bright5 = "${config.colorScheme.palette.base0E}";
|
||||||
|
bright6 = "${config.colorScheme.palette.base0C}";
|
||||||
|
bright7 = "${config.colorScheme.palette.base07}";
|
||||||
|
selection-foreground = "${config.colorScheme.palette.base00}";
|
||||||
|
selection-background = "${config.colorScheme.palette.base0A}";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
{ pkgs, lib, config, ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
openssh
|
|
||||||
sshfs
|
|
||||||
];
|
|
||||||
|
|
||||||
services.ssh-agent.enable = true;
|
|
||||||
|
|
||||||
programs.ssh = {
|
|
||||||
enable = true;
|
|
||||||
compression = true;
|
|
||||||
|
|
||||||
matchBlocks = {
|
|
||||||
"*.pvv.ntnu.no" = {
|
|
||||||
user="adriangl";
|
|
||||||
};
|
|
||||||
"*.ntnu.no !*.pvv.ntnu.no" = {
|
|
||||||
user="adriangl";
|
|
||||||
proxyJump="isvegg.pvv.ntnu.no";
|
|
||||||
};
|
|
||||||
"snotra" = {
|
|
||||||
user="adriangl";
|
|
||||||
proxyJump="adriangl@isvegg.pvv.ntnu.no";
|
|
||||||
hostname="snotra.idi.ntnu.no";
|
|
||||||
};
|
|
||||||
|
|
||||||
#pvv
|
|
||||||
"pvv" = {
|
|
||||||
user="adriangl";
|
|
||||||
hostname="login.pvv.ntnu.no";
|
|
||||||
};
|
|
||||||
"isvegg" = {
|
|
||||||
user="adriangl";
|
|
||||||
hostname="isvegg.pvv.ntnu.no";
|
|
||||||
};
|
|
||||||
|
|
||||||
#home
|
|
||||||
"aragon" = {
|
|
||||||
port = 6969;
|
|
||||||
user="gunalx";
|
|
||||||
hostname="100.74.34.149";
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = "";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
|
@ -4,9 +4,9 @@ imports =
|
||||||
[
|
[
|
||||||
../packages/vim.nix
|
../packages/vim.nix
|
||||||
../services/ssh.nix
|
../services/ssh.nix
|
||||||
|
./sops.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
git
|
git
|
||||||
|
@ -22,6 +22,7 @@ imports =
|
||||||
killall
|
killall
|
||||||
foot.terminfo
|
foot.terminfo
|
||||||
tailscale
|
tailscale
|
||||||
|
sops
|
||||||
];
|
];
|
||||||
|
|
||||||
#just allow unfree, im fine with it.
|
#just allow unfree, im fine with it.
|
||||||
|
@ -47,6 +48,13 @@ imports =
|
||||||
|
|
||||||
#tailscale
|
#tailscale
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
networking.firewall.interfaces."tailscale0" = let
|
||||||
|
all = { from = 0; to = 65535; };
|
||||||
|
in {
|
||||||
|
allowedUDPPortRanges = [ all ];
|
||||||
|
allowedTCPPortRanges = [ all ];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
#system vide bash aliases. TODO: check if only one of these works so i dont need duplicates.
|
#system vide bash aliases. TODO: check if only one of these works so i dont need duplicates.
|
||||||
programs.bash.shellAliases = config.environment.shellAliases;
|
programs.bash.shellAliases = config.environment.shellAliases;
|
||||||
|
@ -73,16 +81,97 @@ imports =
|
||||||
alias lls='ls'
|
alias lls='ls'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#some insecure packages
|
## some insecure packages
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"python3.11-youtube-dl-2021.12.17"
|
"python3.11-youtube-dl-2021.12.17"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
sops.secrets."github/api" = {
|
||||||
|
mode = "0444";
|
||||||
|
group = "root";
|
||||||
|
};
|
||||||
|
|
||||||
#nix stuff
|
#nix stuff
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
nix.gc.automatic = true;
|
nix.gc.automatic = true;
|
||||||
|
nix = {
|
||||||
|
extraOptions = ''
|
||||||
|
builders-use-substitutes = true
|
||||||
|
experimental-features = nix-command flakes impure-derivations ca-derivations
|
||||||
|
!include ${config.sops.secrets."github/api".path}
|
||||||
|
'';
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
trusted-users = [ "gunalx" "root" ];
|
||||||
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
substituters = [
|
||||||
|
"https://cache.nixos.org/"
|
||||||
|
"https://cuda-maintainers.cachix.org"
|
||||||
|
"https://nix-community.cachix.org"
|
||||||
|
"https://nixos-rocm.cachix.org"
|
||||||
|
"https://nixpkgs-unfree.cachix.org"
|
||||||
|
];
|
||||||
|
|
||||||
|
trusted-public-keys = [
|
||||||
|
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
"nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
||||||
|
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
buildMachines = [
|
||||||
|
# { hostName = "bob.pvv.ntnu.no";
|
||||||
|
# system = "x86_64-linux";
|
||||||
|
# maxJobs = 12;
|
||||||
|
# supportedFeatures = [ "big-parallel" ];
|
||||||
|
# speedFactor = 129270;
|
||||||
|
# }
|
||||||
|
{ hostName = "bolle.pbsds.net";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
maxJobs = 6;
|
||||||
|
speedFactor = 12857;
|
||||||
|
}
|
||||||
|
{ hostName = "garp.pbsds.net";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
maxJobs = 4;
|
||||||
|
# i7-6700
|
||||||
|
speedFactor = 8088;
|
||||||
|
}
|
||||||
|
{ hostName = "aragon";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
# if the builder supports building for multiple architectures,
|
||||||
|
# replace the previous line by, e.g.,
|
||||||
|
# systems = ["x86_64-linux" "aarch64-linux"];
|
||||||
|
maxJobs = 6;
|
||||||
|
#speedFactor = 13199;
|
||||||
|
speedFactor = 6000;
|
||||||
|
supportedFeatures = [ ];
|
||||||
|
mandatoryFeatures = [ ];
|
||||||
|
}
|
||||||
|
{ hostName = "galadriel";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
maxJobs = 4;
|
||||||
|
#speedFactor = 8066;
|
||||||
|
speedFactor = 4000;
|
||||||
|
supportedFeatures = [ "cuda" ];
|
||||||
|
mandatoryFeatures = [ ];
|
||||||
|
}
|
||||||
|
# {
|
||||||
|
# hostName = "isvegg.pvv.ntnu.no";
|
||||||
|
# system = "x86_64-linux";
|
||||||
|
# maxJobs = 4;
|
||||||
|
# speedFactor = 4961;
|
||||||
|
# supportedFeatures = [ "big-parallel" ];
|
||||||
|
# mandatoryFeatures = [ ];
|
||||||
|
# }
|
||||||
|
];
|
||||||
|
distributedBuilds = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
flake = "git+https://github.com/adrlau/nix-dotfiles.git";
|
flake = "git+https://github.com/adrlau/nix-dotfiles.git";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ unstable, config, pkgs, lib, ... } @ args:
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
|
@ -10,7 +10,9 @@ imports =
|
||||||
|
|
||||||
../packages/vim.nix
|
../packages/vim.nix
|
||||||
../packages/steam.nix
|
../packages/steam.nix
|
||||||
|
|
||||||
|
"${args.inputs.unstable}/nixos/modules/services/display-managers/ly.nix"
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -19,9 +21,10 @@ imports =
|
||||||
|
|
||||||
#libsForQt5.qt5ct
|
#libsForQt5.qt5ct
|
||||||
#qt6Packages.qt6ct
|
#qt6Packages.qt6ct
|
||||||
|
#where-is-my-sddm-theme
|
||||||
|
|
||||||
where-is-my-sddm-theme
|
|
||||||
swww
|
swww
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
|
@ -49,17 +52,28 @@ imports =
|
||||||
security.pam.services.swaylock = {};
|
security.pam.services.swaylock = {};
|
||||||
security.pam.services.swaylock-effects = {};
|
security.pam.services.swaylock-effects = {};
|
||||||
|
|
||||||
|
|
||||||
|
security.pam.services.ly = {};
|
||||||
|
#security.pam.services.display-manager.ly = {};
|
||||||
services.displayManager = {
|
services.displayManager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sessionPackages = with pkgs; [ sway ];
|
sessionPackages = with pkgs; [ sway ];
|
||||||
sddm = {
|
execCmd = "${pkgs.unstable.ly}/bin/ly";
|
||||||
|
#execCmd = "${unstable.pkgs.ly}/bin/ly";
|
||||||
|
ly = {
|
||||||
|
package = pkgs.unstable.ly;
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "${pkgs.where-is-my-sddm-theme}";
|
settings = {
|
||||||
wayland.enable = true;
|
|
||||||
wayland.compositor = "kwin";
|
animation = "matrix";
|
||||||
autoNumlock = true;
|
waylandsessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
|
||||||
enableHidpi = true;
|
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
# This will automaticx-sopsally import SSH keys as age keys
|
# This will automaticx-sopsally import SSH keys as age keys
|
||||||
sops.age.sshKeyPaths = [
|
sops.age.sshKeyPaths = [
|
||||||
"/etc/ssh/nixos"
|
"/etc/ssh/nixos"
|
||||||
|
"/root/.ssh/nixos"
|
||||||
#"/$HOME/.ssh/nixos"
|
#"/$HOME/.ssh/nixos"
|
||||||
#"/home/gunalx/.ssh/nixos"
|
#"/home/gunalx/.ssh/nixos"
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#ENC[AES256_GCM,data:7kh9f2LAKp46UTh8LmDqvK8xOhHO9mVUD2yzLg4LRR2WU98EpztHmDcHKOF0AG60NsndYaw1en5efU0x/NVAzfdTVPJA2apDs3vtAlzGjvv593Snwb2wa4iK0tM0beMyGvzkSEPs8HOuSLvNpLHWaB1xlC0=,iv:eBoUwZfMPhBnT2+jWqT/EGh/CVNK5qiYeaspFf1VJxY=,tag:nEcuwi2nnACadGR8zw63HA==,type:comment]
|
#ENC[AES256_GCM,data:7kh9f2LAKp46UTh8LmDqvK8xOhHO9mVUD2yzLg4LRR2WU98EpztHmDcHKOF0AG60NsndYaw1en5efU0x/NVAzfdTVPJA2apDs3vtAlzGjvv593Snwb2wa4iK0tM0beMyGvzkSEPs8HOuSLvNpLHWaB1xlC0=,iv:eBoUwZfMPhBnT2+jWqT/EGh/CVNK5qiYeaspFf1VJxY=,tag:nEcuwi2nnACadGR8zw63HA==,type:comment]
|
||||||
acme:
|
acme:
|
||||||
certs: ENC[AES256_GCM,data:L9v0y/T4Vq+fZt5U8YAcyxtvMzv8w+gCwk2z5N027cYiuauuNFYDQ4WV5bTfDL1cSjp30oYvGTlgn3+8s9MA8xqaPJytCNNClRK4isvZKP1YdiVwKdxTg814LDzgPoZsyErSHb+MvgMEUpONifRxFJ7n1HHqcyfeXpV1Bx0=,iv:dnct9KU24ZVaQThA6rTTClRjT+vTi4aD+7UV+oiqoVU=,tag:vTMcHHexHVST3r4wiiTuXA==,type:str]
|
certs: ENC[AES256_GCM,data:L9v0y/T4Vq+fZt5U8YAcyxtvMzv8w+gCwk2z5N027cYiuauuNFYDQ4WV5bTfDL1cSjp30oYvGTlgn3+8s9MA8xqaPJytCNNClRK4isvZKP1YdiVwKdxTg814LDzgPoZsyErSHb+MvgMEUpONifRxFJ7n1HHqcyfeXpV1Bx0=,iv:dnct9KU24ZVaQThA6rTTClRjT+vTi4aD+7UV+oiqoVU=,tag:vTMcHHexHVST3r4wiiTuXA==,type:str]
|
||||||
|
github:
|
||||||
|
api: ENC[AES256_GCM,data:QYXx+9QxXJ4WwDp6FsaSmrngs/+hBugGD8L6ZdiAgu/1/RW/ip1IEC52g49N70PGh545fAone3IiZJKGxqHeitSxTFv111cmTL4dq5s1yXEwUrsrll8n6rEVMJeHnPeAhz8MNYNxJuIfwugp7XlT61v2f/ylNVa77ZubSdNa5w==,iv:Cdnlb8LFQgsWnjEl+eQUHYIiVpXFabb70FFtnWDfIl8=,tag:vzzfJlQFQBncjLJvmFxuzw==,type:str]
|
||||||
nginx:
|
nginx:
|
||||||
defaultpass: ENC[AES256_GCM,data:kbWRuL4GiHjOoy4bvDZN9etrnP9mm3Sc5+ltxXzFzU5G1cbHAa6Si9zzhoA67/MXXvOQ1mp31rQpV1K/WsrxGaajFdHgVYGUJB/RaZfZfg1THF5qvqR7vdOiVRWSIalzGMOSUyJTNg2dgQMbymVbmc/k/vZjkjjsI3oze7oN/NZnQ7nolGybQ6W8DCTRzHi5x20/zTJdXNmJf450az9sWOw7i1A6Avg2pPZ9t2N0WyuIcy1MsQICs7PE4ztrxIF82IsFLQNj6LmXXRQaZ9dCF/3h3yyNShfjgI2owYMmrRJssZCdF5dOPq+HVCEfE3jYBFcAWrvCCnYBczCx+WGl+5sQbfJtZdcDGw1bRw41I71h/W4micjo6W5XbeHVx+Rd,iv:h6gn2VKancyy6dZlON99zjRj4smArwt6I4a3PRjGfZ8=,tag:F++P/Qhh+uUUhBJYp3rGvA==,type:str]
|
defaultpass: ENC[AES256_GCM,data:kbWRuL4GiHjOoy4bvDZN9etrnP9mm3Sc5+ltxXzFzU5G1cbHAa6Si9zzhoA67/MXXvOQ1mp31rQpV1K/WsrxGaajFdHgVYGUJB/RaZfZfg1THF5qvqR7vdOiVRWSIalzGMOSUyJTNg2dgQMbymVbmc/k/vZjkjjsI3oze7oN/NZnQ7nolGybQ6W8DCTRzHi5x20/zTJdXNmJf450az9sWOw7i1A6Avg2pPZ9t2N0WyuIcy1MsQICs7PE4ztrxIF82IsFLQNj6LmXXRQaZ9dCF/3h3yyNShfjgI2owYMmrRJssZCdF5dOPq+HVCEfE3jYBFcAWrvCCnYBczCx+WGl+5sQbfJtZdcDGw1bRw41I71h/W4micjo6W5XbeHVx+Rd,iv:h6gn2VKancyy6dZlON99zjRj4smArwt6I4a3PRjGfZ8=,tag:F++P/Qhh+uUUhBJYp3rGvA==,type:str]
|
||||||
qbittorrent:
|
qbittorrent:
|
||||||
|
@ -30,8 +32,8 @@ sops:
|
||||||
OHNBdXMzZTN0VEVTYkVSbUVRYmo3eUUKvRiPgmrCCK1F5QoSHlV89C2MPl5FvU5i
|
OHNBdXMzZTN0VEVTYkVSbUVRYmo3eUUKvRiPgmrCCK1F5QoSHlV89C2MPl5FvU5i
|
||||||
z61NMJu68UEDsDu8qNRaW3aqpT+1GYsr1evi5imzNwr0qTM2oRwkFQ==
|
z61NMJu68UEDsDu8qNRaW3aqpT+1GYsr1evi5imzNwr0qTM2oRwkFQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2024-05-18T22:06:32Z"
|
lastmodified: "2024-11-15T01:14:16Z"
|
||||||
mac: ENC[AES256_GCM,data:XnO6jTrgyE3/DNkYoNmTVW52NOS+8aLmINGidvWonNLH+FBurdAyYqC+Fnj7n6VrZrnKpFknPvtNV63EVcIroQeB4l12AMow2zhShy7EEwiahJW6DrpM/lbUxOct76KXItacZv+7zMS94uojOqTBhVRjqnBQSCQZgGzhvZTX5hc=,iv:7gA/O747oRu8xgpk1bLi5IgghSXCdq0Xx3KBNmfJ8aw=,tag:UhdKhWKYlTOlSlvJjmoOSg==,type:str]
|
mac: ENC[AES256_GCM,data:4hqXQvlmPKuPkQEcUIpTEUudVknNVNjXjP8pB2UPnPmnr79nLWy/ZOzAcpSob1XNHyB7We5neBUEDYO56PjOM9C022XdZfaqXUC931uqLqo1iLQupApCphf/HR5bwDayv63Mr1Ys9MBdhCrYtlfy4iPiEdlpfDhLuD268EM8x0w=,iv:rgzgkB+5r/xDrN4i8O1f6CXyGxF7Peo+24kkQf96yf4=,tag:TZPaNEEYxFZ0m1CRbPQ0kA==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.8.1
|
version: 3.8.1
|
||||||
|
|
Loading…
Reference in New Issue