Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
07c460e990 | ||
|
|
fc4f2e9779 | ||
|
|
a9f3d0f090 | ||
|
|
5091a8f7a5 | ||
|
|
d3f69117be | ||
|
|
3e2c2864d2 | ||
|
|
51626254b3 | ||
|
|
d6a224a466 | ||
|
|
180ecd08a7 | ||
|
|
18ad8f5a83 | ||
|
|
8525ee16e8 | ||
|
|
b96652db97 | ||
|
|
4ca2440280 | ||
|
|
4e86eedc2d | ||
|
|
e471b57883 | ||
|
|
67ca7276aa | ||
|
|
cdc335e842 | ||
|
|
465ef0b9b1 | ||
|
|
8a8488aa14 | ||
|
|
0c46f6e4b2 |
143
flake.lock
generated
143
flake.lock
generated
@@ -9,13 +9,14 @@
|
||||
"locked": {
|
||||
"lastModified": 1656687988,
|
||||
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
|
||||
"ref": "refs/heads/master",
|
||||
"ref": "master",
|
||||
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
|
||||
"revCount": 160,
|
||||
"type": "git",
|
||||
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "master",
|
||||
"type": "git",
|
||||
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
||||
}
|
||||
@@ -126,6 +127,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,17 +200,17 @@
|
||||
]
|
||||
},
|
||||
"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"
|
||||
"url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||
"url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
|
||||
}
|
||||
},
|
||||
"greg-clients_2": {
|
||||
@@ -220,11 +242,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733050161,
|
||||
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
|
||||
"lastModified": 1743808813,
|
||||
"narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
|
||||
"rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -399,11 +421,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733217105,
|
||||
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
|
||||
"lastModified": 1743420942,
|
||||
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
|
||||
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -431,11 +453,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733261153,
|
||||
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||
"lastModified": 1743703532,
|
||||
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -507,13 +529,46 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1733417713,
|
||||
"narHash": "sha256-/3foD2ePFtms/swS2J77CbAepo1nQ4CHlRBpj1IR8t0=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=",
|
||||
"path": "/nix/store/yl6bc4g0axk5z4v0lsz8fzpxkc3yv1jl-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743848787,
|
||||
"narHash": "sha256-LyE0Sr3mTb/ElWjueF+Lp6bL2FtJcltREd/qvBM0C04=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "6e671d63e6b1e29f31781b8dfef69b147b69ab77",
|
||||
"rev": "5ec7bc0851c41c90f2b62f976fcbf2a0f6f4a88c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -563,7 +618,8 @@
|
||||
"nur": "nur",
|
||||
"unstable": "unstable",
|
||||
"wack-ctf": "wack-ctf",
|
||||
"wack-server-conf": "wack-server-conf"
|
||||
"wack-server-conf": "wack-server-conf",
|
||||
"warez": "warez"
|
||||
}
|
||||
},
|
||||
"sops-nix": {
|
||||
@@ -612,13 +668,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": 1743689281,
|
||||
"narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
|
||||
"rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -785,6 +862,24 @@
|
||||
"repo": "wack-server-conf",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"warez": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738103614,
|
||||
"narHash": "sha256-EvaKn0vfvvX/rtRGFXim+JOQLLAr/1Y4igQrmnLI1CE=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "c3bb59ee5cc6d700f6edf98c65a853efa09993ef",
|
||||
"revCount": 6,
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
59
flake.nix
59
flake.nix
@@ -1,9 +1,6 @@
|
||||
{
|
||||
description = "dandellion's home-manager profiles";
|
||||
|
||||
# nixConfig.extra-substituters = ["https://cache.dodsorf.as"];
|
||||
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
|
||||
@@ -16,7 +13,7 @@
|
||||
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
||||
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
|
||||
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git?ref=master"; #"git+https://git.dodsorf.as/Dandellion/NUR";
|
||||
dan.inputs.nixpkgs.follows = "unstable";
|
||||
|
||||
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
|
||||
@@ -25,11 +22,10 @@
|
||||
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
|
||||
wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
|
||||
greg-clients.url = "git+https://git.pvv.ntnu.no/grzegorz/grzegorz-clients";
|
||||
greg-clients.inputs.nixpkgs.follows = "unstable";
|
||||
|
||||
# helix.url = "github:helix-editor/helix";
|
||||
# helix.inputs.nixpkgs.follows = "unstable";
|
||||
warez.url = "git+https://git.pvv.ntnu.no/tnug/nix-warez";
|
||||
|
||||
nixgl.url = "github:guibou/nixGL";
|
||||
nixgl.inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -50,8 +46,9 @@
|
||||
# helix = inputs.helix.packages.${prev.system}.helix;
|
||||
wack = inputs.wack-ctf.packages.${prev.system}.wack;
|
||||
})
|
||||
nur.overlay
|
||||
nixgl.overlay
|
||||
nur.overlays.default
|
||||
nixgl.overlays.default
|
||||
inputs.warez.overlays.default
|
||||
];
|
||||
|
||||
mkHome =
|
||||
@@ -78,11 +75,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"; };
|
||||
|
||||
@@ -98,13 +95,51 @@
|
||||
];
|
||||
};
|
||||
|
||||
soryu-old = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./hosts/asuka/soryu-old/configuration.nix
|
||||
];
|
||||
};
|
||||
soryu = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./hosts/soryu/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = false;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.daniel = import ./home/machines/soryu.nix;
|
||||
home-manager.extraSpecialArgs = {
|
||||
overlays = defaultOverlays;
|
||||
};
|
||||
}
|
||||
|
||||
./hosts/asuka/soryu/configuration.nix
|
||||
];
|
||||
};
|
||||
# langley = nixpkgs.lib.nixosSystem {
|
||||
# system = "x86_64-linux";
|
||||
# specialArgs = {
|
||||
# inherit inputs;
|
||||
# };
|
||||
# modules = [
|
||||
# ./hosts/asuka/langley/configuration.nix
|
||||
# ];
|
||||
# };
|
||||
|
||||
ikari = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./hosts/ikari/configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
profiles.games.enable = true;
|
||||
|
||||
profiles.timetracking.enable = true;
|
||||
|
||||
home.packages = [
|
||||
pkgs.unstable.osu-lazer-bin
|
||||
];
|
||||
|
||||
25
home/machines/ikari.nix
Normal file
25
home/machines/ikari.nix
Normal 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
|
||||
];
|
||||
}
|
||||
@@ -18,31 +18,14 @@
|
||||
profiles.xsession.enable = true;
|
||||
profiles.zsh.enable = true;
|
||||
|
||||
profiles.games.enable = true;
|
||||
|
||||
profiles.timetracking.enable = true;
|
||||
|
||||
services.gammastep = {
|
||||
enable = true;
|
||||
dawnTime = "7:00-8:15";
|
||||
duskTime = "21:30-22:30";
|
||||
};
|
||||
|
||||
services.activitywatch = {
|
||||
enable = true;
|
||||
watchers = {
|
||||
aw-watcher-afk = {
|
||||
package = pkgs.activitywatch;
|
||||
settings = {
|
||||
timeout = 300;
|
||||
poll_time = 2;
|
||||
};
|
||||
};
|
||||
aw-watcher-window = {
|
||||
package = pkgs.activitywatch;
|
||||
settings = {
|
||||
poll_time = 1;
|
||||
# exclude_title = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
profiles.games.enable = true;
|
||||
}
|
||||
|
||||
31
home/machines/soryu.nix
Normal file
31
home/machines/soryu.nix
Normal file
@@ -0,0 +1,31 @@
|
||||
{ config, lib, pkgs, overlays, ... }:
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
imports = [ ../profiles ];
|
||||
|
||||
machine = {
|
||||
name = "Soryu";
|
||||
eth = "enp9s0";
|
||||
wlan = null;
|
||||
secondary-fs = 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;
|
||||
|
||||
profiles.timetracking.enable = true;
|
||||
|
||||
home.packages = [
|
||||
pkgs.unstable.osu-lazer-bin
|
||||
];
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -81,7 +82,9 @@ in
|
||||
ripgrep
|
||||
|
||||
gregctl
|
||||
wack
|
||||
# wack
|
||||
#
|
||||
unstable.ollama
|
||||
] ++ lib.optionals cfg.plus [
|
||||
ffmpeg-full
|
||||
] ++ lib.optionals config.profiles.gui.enable [
|
||||
@@ -95,7 +98,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 +114,7 @@ in
|
||||
kdenlive
|
||||
frei0r
|
||||
audacity
|
||||
inkscape
|
||||
# inkscape
|
||||
blender
|
||||
|
||||
mkvtoolnix
|
||||
@@ -199,22 +201,43 @@ 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;
|
||||
@@ -314,6 +337,7 @@ in
|
||||
home.sessionVariables = {
|
||||
EDITOR = "hx";
|
||||
GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api";
|
||||
OLLAMA_HOST="100.64.0.19";
|
||||
};
|
||||
|
||||
xdg.mimeApps = {
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
./gui.nix
|
||||
./non-nixos.nix
|
||||
./games
|
||||
./timetracking
|
||||
];
|
||||
}
|
||||
|
||||
@@ -12,13 +12,11 @@ in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
fortune
|
||||
lolcat
|
||||
neofetch
|
||||
pipes
|
||||
] ++ lib.optionals config.profiles.gui.enable [
|
||||
steam
|
||||
|
||||
unstable.prismlauncher
|
||||
prismlauncher
|
||||
fjordlauncher
|
||||
# minetest
|
||||
# dwarf-fortress-packages.dwarf-fortress-full
|
||||
# superTuxKart
|
||||
|
||||
30
home/profiles/timetracking/default.nix
Normal file
30
home/profiles/timetracking/default.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{ config, lib, pkgs, overlays, ... }:
|
||||
let
|
||||
cfg = config.profiles.timetracking;
|
||||
in {
|
||||
options.profiles.timetracking = {
|
||||
enable = lib.mkEnableOption "doin timetracking";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.activitywatch = {
|
||||
enable = true;
|
||||
watchers = {
|
||||
aw-watcher-afk = {
|
||||
package = pkgs.activitywatch;
|
||||
settings = {
|
||||
timeout = 300;
|
||||
poll_time = 2;
|
||||
};
|
||||
};
|
||||
aw-watcher-window = {
|
||||
package = pkgs.activitywatch;
|
||||
settings = {
|
||||
poll_time = 1;
|
||||
# exclude_title = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -173,7 +173,7 @@ in
|
||||
pkgs.dmenu
|
||||
|
||||
pkgs.scrot
|
||||
pkgs.neofetch
|
||||
# pkgs.neofetch
|
||||
#pkgs.dan.colors
|
||||
pkgs.xclip
|
||||
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
SYSTEMD_NSPAWN_TMPFS_TMP = "0";
|
||||
};
|
||||
serviceConfig = {
|
||||
CPUQuota = "300%";
|
||||
MemoryHigh = "29G";
|
||||
MemoryMax = "30G";
|
||||
MemorySwapMax = "50G";
|
||||
CPUQuota = "1400%";
|
||||
MemoryHigh = "90G";
|
||||
MemoryMax = "94G";
|
||||
MemorySwapMax = "40G";
|
||||
ExecStart = "systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i -D /mnt/human/machines/ubuntu-ai";
|
||||
};
|
||||
# overrideStrategy = "asDropin";
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
memoryMax = 32 * 1024 * 1024 * 1024; # 16 GB ZRAM
|
||||
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
|
||||
};
|
||||
|
||||
disabledModules = [
|
||||
71
hosts/asuka/soryu-old/wack.nix
Normal file
71
hosts/asuka/soryu-old/wack.nix
Normal file
@@ -0,0 +1,71 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 1337 ];
|
||||
|
||||
networking.nat.forwardPorts = [
|
||||
{
|
||||
destination = "${config.containers.ireul.hostAddress}:1337";
|
||||
proto = "tcp";
|
||||
sourcePort = 1337;
|
||||
}
|
||||
];
|
||||
|
||||
containers.ireul = {
|
||||
bindMounts."/wordlists" = {
|
||||
hostPath = "/mnt/human/wordlists";
|
||||
isReadOnly = false;
|
||||
};
|
||||
privateNetwork = true;
|
||||
hostAddress = "192.168.10.1";
|
||||
localAddress = "192.168.10.2";
|
||||
forwardPorts = [
|
||||
{ containerPort = 1337;
|
||||
hostPort = 1337;
|
||||
protocol = "tcp";
|
||||
}
|
||||
];
|
||||
|
||||
bindMounts."/dev/dri" = {
|
||||
hostPath = "/dev/dri";
|
||||
isReadOnly = false;
|
||||
};
|
||||
bindMounts."/dev/kfd" = {
|
||||
hostPath = "/dev/kfd";
|
||||
isReadOnly = false;
|
||||
};
|
||||
bindMounts."/run/opengl-driver" = {
|
||||
hostPath = "/run/opengl-driver";
|
||||
isReadOnly = false;
|
||||
};
|
||||
|
||||
allowedDevices = [
|
||||
{ node = "/dev/dri/card0"; modifier = "rw"; }
|
||||
{ node = "/dev/dri/renderD128"; modifier = "rw"; }
|
||||
{ node = "/dev/kfd"; modifier = "rw"; }
|
||||
];
|
||||
|
||||
config = { config, pkgs, ... }: {
|
||||
services.openssh.enable = true;
|
||||
services.openssh.ports = [ 1337 ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
hashcat
|
||||
hashcat-utils
|
||||
john
|
||||
|
||||
kitty.terminfo
|
||||
];
|
||||
|
||||
users.groups.video.members = builtins.attrNames config.users.users;
|
||||
|
||||
|
||||
programs.zsh.enable = true;
|
||||
imports = [ (inputs.wack-server-conf + /users/default.nix) ];
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
207
hosts/asuka/soryu/configuration.nix
Normal file
207
hosts/asuka/soryu/configuration.nix
Normal file
@@ -0,0 +1,207 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
# ./wack.nix
|
||||
./ollama.nix
|
||||
../../common/builder.nix
|
||||
];
|
||||
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
rocmSupport = true;
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot = {
|
||||
enable = true;
|
||||
netbootxyz = { enable = true; sortKey = "y_netbootxyz"; };
|
||||
edk2-uefi-shell = { enable = true; sortKey = "z_edk2-uefi-shell"; };
|
||||
extraEntries = {
|
||||
"old-soryuu.conf" = ''
|
||||
title Old Soryuu;
|
||||
efi /efi/edk2-uefi-shell/shell.efi
|
||||
options -nointerrupt -nomap -noversion HD1b65535a:\EFI\systemd\systemd-bootx64.efi
|
||||
sort-key o_soryuu-old
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# programs.adb.enable = true;
|
||||
|
||||
systemd.enableEmergencyMode = false;
|
||||
|
||||
networking.hostName = "soryu";
|
||||
networking.extraHosts = ''
|
||||
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com #Star Citizen EAC workaround
|
||||
'';
|
||||
|
||||
# Star Citizen resource limits
|
||||
boot.kernel.sysctl = {
|
||||
"vm.max_map_count" = 16777216;
|
||||
"fs.file-max" = 524288;
|
||||
};
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
|
||||
};
|
||||
|
||||
services.resolved.enable = true;
|
||||
services.resolved.dnssec = "false";
|
||||
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
services.murmur = {
|
||||
enable = true;
|
||||
# registerName = "DODSORFAS";
|
||||
welcometext = "Dans PC at singsaker smh backup mumble server";
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = false;
|
||||
dedicatedServer.openFirewall = false;
|
||||
};
|
||||
|
||||
services.tailscale.enable = true;
|
||||
|
||||
networking.firewall.interfaces."tailscale0" = let
|
||||
all = { from = 0; to = 65535; };
|
||||
in {
|
||||
allowedUDPPortRanges = [ all ];
|
||||
allowedTCPPortRanges = [ all ];
|
||||
};
|
||||
|
||||
# Select internationalisation properties.
|
||||
console.keyMap = "no-latin1";
|
||||
|
||||
time.timeZone = "Europe/Oslo";
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget vim 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;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
networking.firewall.enable = true;
|
||||
networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
|
||||
networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];
|
||||
|
||||
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
|
||||
hardware.graphics.enable = true;
|
||||
hardware.graphics.enable32Bit = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
libva rocmPackages.clr.icd
|
||||
];
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
let
|
||||
rocmEnv = pkgs.symlinkJoin {
|
||||
name = "rocm-combined";
|
||||
paths = with pkgs.rocmPackages; [
|
||||
rocblas
|
||||
hipblas
|
||||
clr
|
||||
];
|
||||
};
|
||||
in [
|
||||
"L+ /opt/rocm - - - - ${rocmEnv}"
|
||||
];
|
||||
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager = {
|
||||
defaultSession = "xsession";
|
||||
session = [
|
||||
{ manage = "desktop";
|
||||
name = "xsession";
|
||||
start = "exec $HOME/.xsession";
|
||||
}
|
||||
];
|
||||
};
|
||||
services.xserver.xkb.layout = "no";
|
||||
# services.xserver.xkbOptions = "eurosign:e";
|
||||
|
||||
services.xserver.displayManager.lightdm.enable = true;
|
||||
services.xserver.videoDrivers = ["amdgpu"];
|
||||
|
||||
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
|
||||
|
||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
||||
|
||||
|
||||
|
||||
# services.ipfs.enable = true;
|
||||
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
|
||||
|
||||
nix.trustedUsers = [ "daniel" ];
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
||||
users.users.daniel = {
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "wheel" "networkmanager" "docker" "video" "libvirtd" ];
|
||||
initialPassword = "Abc123";
|
||||
};
|
||||
|
||||
programs.dconf.enable = true;
|
||||
services.dbus.packages = with pkgs; [ dconf ];
|
||||
|
||||
# This value determines the NixOS release with which your system is to be
|
||||
# compatible, in order to avoid breaking some software such as database
|
||||
# servers. You should change this only after NixOS release notes say you
|
||||
# should.
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
56
hosts/asuka/soryu/hardware-configuration.nix
Normal file
56
hosts/asuka/soryu/hardware-configuration.nix
Normal file
@@ -0,0 +1,56 @@
|
||||
# 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 = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.initrd.luks.devices."crypted-main".device = "/dev/disk/by-uuid/2f59c91a-6765-439a-bc8d-6a84d662ba0c";
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/2285-60E9";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-partlabel/swap"; randomEncryption.enable = true; } ];
|
||||
|
||||
# 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.docker0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
29
hosts/asuka/soryu/ollama.nix
Normal file
29
hosts/asuka/soryu/ollama.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "rocm";
|
||||
package = inputs.unstable.legacyPackages.x86_64-linux.ollama;
|
||||
rocmOverrideGfx = "10.3.0";
|
||||
environmentVariables = {
|
||||
ROCR_VISIBLE_DEVICES = "GPU-5ecd14c0d670740b";
|
||||
};
|
||||
host = "100.64.0.19";
|
||||
loadModels = [
|
||||
"gemma3:4b"
|
||||
"gemma3:12b"
|
||||
"gemma3:27b"
|
||||
"deepseek-r1:7b"
|
||||
"deepseek-r1:14b"
|
||||
"qwq:32b"
|
||||
"codestral:22b"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.ollama = {
|
||||
serviceConfig = {
|
||||
SupplementaryGroups = [ "video" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -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 = {
|
||||
@@ -173,46 +205,34 @@
|
||||
nix.settings.trusted-users = [ "daniel" ];
|
||||
|
||||
nix.buildMachines = [
|
||||
# { hostName = "bob.pvv.ntnu.no";
|
||||
# system = "x86_64-linux";
|
||||
# maxJobs = 12;
|
||||
# supportedFeatures = [ "big-parallel" ];
|
||||
# speedFactor = 129270;
|
||||
# }
|
||||
{ hostName = "bolle.pbsds.net";
|
||||
{ hostName = "soryu";
|
||||
system = "x86_64-linux";
|
||||
maxJobs = 6;
|
||||
speedFactor = 12857;
|
||||
maxJobs = 16;
|
||||
supportedFeatures = [ "big-parallel" ];
|
||||
speedFactor = 66317;
|
||||
}
|
||||
{ hostName = "garp.pbsds.net";
|
||||
system = "x86_64-linux";
|
||||
maxJobs = 4;
|
||||
# i7-6700
|
||||
speedFactor = 8088;
|
||||
}
|
||||
{ hostName = "lilith";
|
||||
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 = "desktop";
|
||||
system = "x86_64-linux";
|
||||
maxJobs = 4;
|
||||
#speedFactor = 8066;
|
||||
speedFactor = 4000;
|
||||
supportedFeatures = [ ];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
# { hostName = "sachiel";
|
||||
# { hostName = "bob.pvv.ntnu.no";
|
||||
# system = "x86_64-linux";
|
||||
# maxJobs = 1;
|
||||
# #speedfactor =
|
||||
# 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 = "lilith";
|
||||
# system = "x86_64-linux";
|
||||
# maxJobs = 6;
|
||||
# #speedFactor = 13199;
|
||||
# speedFactor = 6000;
|
||||
# }
|
||||
# {
|
||||
# hostName = "isvegg.pvv.ntnu.no";
|
||||
|
||||
18
hosts/common/builder.nix
Normal file
18
hosts/common/builder.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
users.users.nixbuilder = {
|
||||
group = "nixbuilder";
|
||||
isSystemUser = true;
|
||||
useDefaultShell = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDpGSDczzDOhTETCj+uB5e3/9QbOCaVW1knM+n1ey0n6LXH7uiPPmzuZiqfzmfbB1z4bjM2zpn3D6Et6zRCrBUjhTZqf/5GoNlvhVA6QYmBmBp98b8oY7juj5cmu55voxD0S5rC1mQMnWAAf8e8OPbkhs9Lt0XlOYdotLNIZQubzWqE2DK45g/h17ELJs+jkNXoalFjLvLXWzE/C+3pYoeNJVGHfVMTIwt7o64E6JXhxuYTYdSIuzd+BjntkSCXzcAzBFMRwkdlFVoBtLUMMcMQl39kcXv7lAQ8pv+8b1j1N9WuQVf1qEAcZguaimI1ifbXP5d841pZPApCj5KXectIEldfTrcwg8rZpd2UfYS/3XCcOuidBGprY7XsU/jz8wHbH68UjUrsLyaOMnG2ChYztnf63vm3gRs3Fc6FqTycpgYOPDeZBVTcMyPGgtiZvhnTeY20xFS5lK6M+dmgaDqH24kPLiwYSpUF2NK+Rg/2bZxvt/GaSr4U6fJGi3FCJOM= root@DanixLaptop"
|
||||
];
|
||||
};
|
||||
|
||||
users.groups.nixbuilder = {};
|
||||
|
||||
nix.settings.trusted-users = [ "nixbuilder" ];
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
}
|
||||
199
hosts/ikari/configuration.nix
Normal file
199
hosts/ikari/configuration.nix
Normal 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?
|
||||
}
|
||||
|
||||
38
hosts/ikari/hardware-configuration.nix
Normal file
38
hosts/ikari/hardware-configuration.nix
Normal 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;
|
||||
}
|
||||
Reference in New Issue
Block a user