Compare commits

..

No commits in common. "4e86eedc2dc44a38b5c0f1184a3f2396174788e0" and "465ef0b9b1f67185be6d2cbff76267c7a67be279" have entirely different histories.

5 changed files with 57 additions and 101 deletions

View File

@ -38,12 +38,11 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
nix-output-monitor unstable.nix-output-monitor
nix-top nix-top
nix-index nix-index
nix-tree nix-tree
# unstable.comma unstable.comma
nixd
openvpn openvpn
@ -96,6 +95,7 @@ in
plasma5Packages.kdegraphics-thumbnailers plasma5Packages.kdegraphics-thumbnailers
plasma5Packages.kio plasma5Packages.kio
plasma5Packages.kio-extras plasma5Packages.kio-extras
krename
konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
gedit gedit
@ -112,7 +112,7 @@ in
kdenlive kdenlive
frei0r frei0r
audacity audacity
# inkscape inkscape
blender blender
mkvtoolnix mkvtoolnix
@ -199,44 +199,23 @@ in
}; };
}; };
programs.zed-editor = { programs.vscode = {
enable = config.profiles.gui.enable; enable = config.profiles.gui.enable;
package = pkgs.unstable.zed-editor; package = pkgs.vscodium;
extensions = [ extensions = with pkgs.vscode-extensions; [
"nix" bbenoist.nix
rust-lang.rust-analyzer
vadimcn.vscode-lldb
] ++ lib.optionals config.nixpkgs.config.allowUnfree [
ms-vsliveshare.vsliveshare
]; ];
userSettings = { userSettings = {
telemetry.metrics = false; "editor.insertSpaces" = false;
telemetry.diagnostics = false; "terminal.integrated.fontFamily" = "MesloLGS NF";
features = {
copilot = false;
};
buffer_font_family = "MesloLGS NF";
base_keymap = "VSCode";
language_overrides = {
Rust = {
inlay_hints.enabled = true;
};
};
}; };
}; };
# programs.vscode = {
# enable = config.profiles.gui.enable;
# package = pkgs.vscodium;
# extensions = with pkgs.vscode-extensions; [
# bbenoist.nix
# rust-lang.rust-analyzer
# vadimcn.vscode-lldb
# ] ++ lib.optionals config.nixpkgs.config.allowUnfree [
# ms-vsliveshare.vsliveshare
# ];
# userSettings = {
# "editor.insertSpaces" = false;
# "terminal.integrated.fontFamily" = "MesloLGS NF";
# };
# };
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = "daniel.olsen99@gmail.com"; userEmail = "daniel.olsen99@gmail.com";

View File

@ -12,10 +12,13 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
fortune fortune
lolcat
neofetch
pipes
] ++ lib.optionals config.profiles.gui.enable [ ] ++ lib.optionals config.profiles.gui.enable [
steam steam
prismlauncher unstable.prismlauncher
# minetest # minetest
# dwarf-fortress-packages.dwarf-fortress-full # dwarf-fortress-packages.dwarf-fortress-full
# superTuxKart # superTuxKart

View File

@ -173,7 +173,7 @@ in
pkgs.dmenu pkgs.dmenu
pkgs.scrot pkgs.scrot
# pkgs.neofetch pkgs.neofetch
#pkgs.dan.colors #pkgs.dan.colors
pkgs.xclip pkgs.xclip

View File

@ -3,23 +3,29 @@
config = lib.mkIf config.profiles.xsession.enable { config = lib.mkIf config.profiles.xsession.enable {
programs.kitty = { home.file.kitty = {
enable = true; target = ".config/kitty/kitty.conf";
font.name = "MesloLGS NF"; text = ''
font.size = 12; #term xterm-256color
keybindings = { font_family MesloLGS NF
"ctrl+shift+c" = "copy_to_clipboard"; font_size 12.0
"ctrl+shift+v" = "paste_from_clipboard"; background_opacity 0.7
"ctrl+plus" = "change_font_size all +2.0"; clear_all_shortcuts yes
"ctrl+shift+plus" = "change_font_size all -2.0";
}; map ctrl+shift+c copy_to_clipboard
settings = { map ctrl+shift+v paste_from_clipboard
"background_opacity" = 0.7;
};
map ctrl+plus change_font_size all +2.0
map ctrl+shift+plus change_font_size all -2.0
'';
}; };
home.packages = [ home.packages = [
pkgs.kitty
pkgs.ncurses.dev pkgs.ncurses.dev
]; ];
}; };

View File

@ -14,38 +14,6 @@
# "10.10.111.103" = [ "snowbell.htb" "legacy.snowbell.htb" "management.snowbell.htb" ]; # "10.10.111.103" = [ "snowbell.htb" "legacy.snowbell.htb" "management.snowbell.htb" ];
}; };
services.restic.backups."main" = {
repositoryFile = "/root/restic-main-repo";
passwordFile = "/root/restic-main-password";
pruneOpts = [
"--keep-last 2"
"--keep-within 3d"
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
"--keep-yearly 5"
];
paths = [
"/home/daniel"
"/var/lib"
];
exclude = [
"/home/*/.cache"
"/home/*/.local/share/Trash"
"/home/*/.cargo"
"/home/*/.local/share/Steam/*"
"!/home/*/.local/share/Steam/compatdata"
"/home/*/mnt"
];
extraBackupArgs = [
"--one-file-system"
];
};
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
@ -55,24 +23,24 @@
programs.wireshark.enable = true; programs.wireshark.enable = true;
programs.wireshark.package = pkgs.wireshark; programs.wireshark.package = pkgs.wireshark;
services.mysql.enable = true; # services.mysql.enable = true;
services.mysql.package = pkgs.mariadb; # services.mysql.package = pkgs.mariadb;
services.mysql.settings.mysqld = { # services.mysql.settings.mysqld = {
bind-address = "127.0.0.1"; # bind-address = "127.0.0.1";
port = 3306; # port = 3306;
}; # };
services.mysql.ensureUsers = [ # services.mysql.ensureUsers = [
{ # {
name = "daniel"; # name = "daniel";
ensurePermissions = { # ensurePermissions = {
"lab1.*" = "ALL PRIVILEGES"; # "lab1.*" = "ALL PRIVILEGES";
"lab2.*" = "ALL PRIVILEGES"; # "lab2.*" = "ALL PRIVILEGES";
"lab3.*" = "ALL PRIVILEGES"; # "lab3.*" = "ALL PRIVILEGES";
"lab4.*" = "ALL PRIVILEGES"; # "lab4.*" = "ALL PRIVILEGES";
"lab5.*" = "ALL PRIVILEGES"; # "lab5.*" = "ALL PRIVILEGES";
}; # };
} # }
]; # ];
# services.create_ap.enable = false; # services.create_ap.enable = false;
# services.create_ap.settings = { # services.create_ap.settings = {