7 Commits

Author SHA1 Message Date
Daniel Olsen
4e86eedc2d enable old mysql dbs 2025-02-21 01:47:08 +01:00
Daniel Olsen
e471b57883 take restic backups 2025-02-21 01:47:08 +01:00
Daniel Olsen
67ca7276aa use home-manager module to configure kitty, enable working directory in window title 2025-02-21 01:47:08 +01:00
Daniel Olsen
cdc335e842 replace vscode, clean up packages 2025-02-21 01:46:48 +01:00
Daniel Olsen
465ef0b9b1 wowee 2025-01-26 13:28:38 +01:00
Daniel Olsen
8a8488aa14 backups woo 2025-01-20 16:36:52 +01:00
Daniel Olsen
0c46f6e4b2 ikari: init 2025-01-11 03:42:21 +01:00
10 changed files with 458 additions and 79 deletions

103
flake.lock generated
View File

@@ -126,6 +126,27 @@
"url": "https://git.dodsorf.as/Dandellion/dotfiles.git"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@@ -178,11 +199,11 @@
]
},
"locked": {
"lastModified": 1726861934,
"narHash": "sha256-lOzPDwktd+pwszUTbpUdQg6iCzInS11fHLfkjmnvJrM=",
"lastModified": 1736178795,
"narHash": "sha256-mPdi8cgvIDYcgG3FRG7A4BOIMu2Jef96TPMnV00uXlM=",
"ref": "refs/heads/master",
"rev": "546d921ec46735dbf876e36f4af8df1064d09432",
"revCount": 78,
"rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1",
"revCount": 79,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
},
@@ -220,11 +241,11 @@
]
},
"locked": {
"lastModified": 1733050161,
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"lastModified": 1736373539,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github"
},
"original": {
@@ -399,11 +420,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1733217105,
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
"lastModified": 1737359802,
"narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
"rev": "61c79181e77ef774ab0468b28a24bc2647d498d6",
"type": "github"
},
"original": {
@@ -431,11 +452,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1733261153,
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"lastModified": 1737299813,
"narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
"type": "github"
},
"original": {
@@ -507,13 +528,34 @@
"type": "indirect"
}
},
"nur": {
"nixpkgs_2": {
"locked": {
"lastModified": 1733417713,
"narHash": "sha256-/3foD2ePFtms/swS2J77CbAepo1nQ4CHlRBpj1IR8t0=",
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1737379832,
"narHash": "sha256-BLdFffOLNsh02U9RUFxr3LeQAAsIr8NDrILIpV3te4c=",
"owner": "nix-community",
"repo": "NUR",
"rev": "6e671d63e6b1e29f31781b8dfef69b147b69ab77",
"rev": "4cb6b90dd6d4a74d9ffb372fef7749c77e6538f3",
"type": "github"
},
"original": {
@@ -612,13 +654,34 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1733229606,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
"lastModified": 1737264083,
"narHash": "sha256-6QqSrHPN+ZD+7HuadVLuFNUaM8XnmZF3EO7QViM1b80=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
"rev": "aa6ae0afa6adeb5c202a168e51eda1d3da571117",
"type": "github"
},
"original": {

View File

@@ -78,11 +78,11 @@
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" ];
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" "ikari" ];
in
{
homeConfigurations = mkHomes [ "laptop" "headless" ] { }
homeConfigurations = mkHomes [ "laptop" "headless" "ikari" ] { }
// mkHomes [ "desktop" ] { username = "dan"; }
// mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; };
@@ -107,6 +107,16 @@
./hosts/soryu/configuration.nix
];
};
ikari = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
./hosts/ikari/configuration.nix
];
};
};
nixosModules = {

25
home/machines/ikari.nix Normal file
View File

@@ -0,0 +1,25 @@
{ config, lib, pkgs, overlays, ... }:
{
nixpkgs.overlays = overlays;
nixpkgs.config.allowUnfreePredicate = (pkg: true);
nixpkgs.config.allowUnfree = true;
imports = [ ../profiles ];
machine = {
name = "ikari";
eth = "eno1";
wlan = null;
};
profiles.base.enable = true;
profiles.base.plus = true;
profiles.xsession.enable = true;
profiles.audio.fancy = true;
profiles.zsh.enable = true;
profiles.games.enable = true;
home.packages = [
pkgs.unstable.osu-lazer
];
}

View File

@@ -38,11 +38,12 @@ in
home.packages = with pkgs; [
unstable.nix-output-monitor
nix-output-monitor
nix-top
nix-index
nix-tree
unstable.comma
# unstable.comma
nixd
openvpn
@@ -95,7 +96,6 @@ in
plasma5Packages.kdegraphics-thumbnailers
plasma5Packages.kio
plasma5Packages.kio-extras
krename
konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
gedit
@@ -112,7 +112,7 @@ in
kdenlive
frei0r
audacity
inkscape
# inkscape
blender
mkvtoolnix
@@ -199,23 +199,44 @@ in
};
};
programs.vscode = {
programs.zed-editor = {
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
package = pkgs.unstable.zed-editor;
extensions = [
"nix"
];
userSettings = {
"editor.insertSpaces" = false;
"terminal.integrated.fontFamily" = "MesloLGS NF";
telemetry.metrics = false;
telemetry.diagnostics = false;
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 = {
enable = true;
userEmail = "daniel.olsen99@gmail.com";

View File

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

View File

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

View File

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

View File

@@ -14,6 +14,38 @@
# "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" ];
virtualisation.podman.enable = true;
@@ -23,24 +55,24 @@
programs.wireshark.enable = true;
programs.wireshark.package = pkgs.wireshark;
# services.mysql.enable = true;
# services.mysql.package = pkgs.mariadb;
# services.mysql.settings.mysqld = {
# bind-address = "127.0.0.1";
# port = 3306;
# };
# services.mysql.ensureUsers = [
# {
# name = "daniel";
# ensurePermissions = {
# "lab1.*" = "ALL PRIVILEGES";
# "lab2.*" = "ALL PRIVILEGES";
# "lab3.*" = "ALL PRIVILEGES";
# "lab4.*" = "ALL PRIVILEGES";
# "lab5.*" = "ALL PRIVILEGES";
# };
# }
# ];
services.mysql.enable = true;
services.mysql.package = pkgs.mariadb;
services.mysql.settings.mysqld = {
bind-address = "127.0.0.1";
port = 3306;
};
services.mysql.ensureUsers = [
{
name = "daniel";
ensurePermissions = {
"lab1.*" = "ALL PRIVILEGES";
"lab2.*" = "ALL PRIVILEGES";
"lab3.*" = "ALL PRIVILEGES";
"lab4.*" = "ALL PRIVILEGES";
"lab5.*" = "ALL PRIVILEGES";
};
}
];
# services.create_ap.enable = false;
# services.create_ap.settings = {

View File

@@ -0,0 +1,199 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
];
services.restic.backups."main" = {
repositoryFile = "/root/restic-main-repo";
passwordFile = "/root/restic-main-password";
pruneOpts = [
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
"--keep-yearly 2"
];
paths = [
"/var/lib"
"/home/daniel"
];
exclude = [
"/home/*/.cache"
"/home/*/.local/Trash"
"/home/*/.local/share/Steam/*"
"!/home/*/.local/share/Steam/steamapps/compatdata"
"/home/*/.cargo"
"/home/*/**/target"
];
};
services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_15;
services.postgresql.authentication = ''
host all all 192.168.10.0/24 md5
'';
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
# Add additional package names here
"nvidia-x11"
"nvidia-settings"
"nvidia-persistenced"
"steam"
"steam-original"
"steam-run"
"steam-unwrapped"
];
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable;
modesetting.enable = true;
nvidiaSettings = true;
powerManagement.finegrained = false;
open = false;
};
#hardware.graphics.enable = true;
hardware.opengl.driSupport32Bit = true;
programs.steam = {
enable = true;
remotePlay.openFirewall = false;
dedicatedServer.openFirewall = false;
};
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "ikari"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
services.tailscale.enable = true;
# Set your time zone.
time.timeZone = "Europe/Oslo";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "nb_NO.UTF-8/UTF-8" ];
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_TIME = "nb_NO.UTF-8";
LC_PAPER = "nb_NO.UTF-8";
LC_NAME = "nb_NO.UTF-8";
LC_ADDRESS = "nb_NO.UTF-8";
LC_TELEPHONE = "nb_NO.UTF-8";
LC_MEASUREMENT = "nb_NO.UTF-8";
LC_IDENTIFICATION = "nb_NO.UTF-8";
};
console = {
font = "Lat2-Terminus16";
useXkbConfig = true; # use xkb.options in tty.
};
services.displayManager.defaultSession = "xsession";
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.displayManager = {
session = [
{
manage = "desktop";
name = "xsession";
start = "exec $HOME/.xsession";
}
];
};
services.dbus.packages = with pkgs; [ pkgs.dconf ];
programs.dconf.enable = true;
# Configure keymap in X11
services.xserver.xkb.layout = "no";
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound.
security.rtkit.enable = true;
services.pipewire = {
enable = true;
pulse.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
jack.enable = true;
};
programs.zsh.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.daniel = {
isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user.
shell = pkgs.zsh;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8iMOx3eTiG5AmDh2KjKcigf7xdRKn9M7iZQ4RqP0np0UN2NUbu+VAMJmkWFyi3JpxmLuhszU0F1xY+3qM3ARduy1cs89B/bBE85xlOeYhcYVmpcgPR5xduS+TuHTBzFAgp+IU7/lgxdjcJ3PH4K0ruGRcX1xrytmk/vdY8IeSk3GVWDRrRbH6brO4cCCFjX0zJ7G6hBQueTPQoOy3jrUvgpRkzZY4ZCuljXtxbuX5X/2qWAkp8ca0iTQ5FzNA5JUyj+DWeEzjIEz6GrckOdV2LjWpT9+CtOqoPZOUudE1J9mJk4snNlMQjE06It7Kr50bpwoPqnxjo7ZjlHFLezl"
];
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
git
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
services.openssh.openFirewall = false;
networking.firewall.interfaces."tailscale0" = let
all = { from = 0; to = 65535; };
in {
allowedUDPPortRanges = [ all ];
allowedTCPPortRanges = [ all ];
};
networking.firewall.trustedInterfaces = [ "eno1" ];
nix.settings.trusted-users = [ "daniel" ];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "24.05"; # Did you read the comment?
}

View File

@@ -0,0 +1,38 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/92bec2f5-9ae6-40c1-9c7b-a7b03ef8b79f";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8FB1-1C05";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}