BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

framework-2024-09-30-15-42-04

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-09-30 15:42:04 +02:00
parent c80ad70ec3
commit 819e3d6fae
6 changed files with 71 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -8,7 +8,6 @@ it's important to add the ssh host key to known hosts
[u278697.your-storagebox.de]:23 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw== [u278697.your-storagebox.de]:23 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw==
[u278697.your-storagebox.de]:23 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw== [u278697.your-storagebox.de]:23 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw==
``` ```
### Commands ### Commands

37
configs/common.nix
View File

@ -1,5 +1,19 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
boot = {
tmp = {
useTmpfs = true;
cleanOnBoot = true;
};
# kernelParams = [ "quiet" ];
consoleLogLevel = 0;
kernel.sysctl = { "vm.max_map_count" = 262144; };
initrd.systemd.enable = (!config.boot.swraid.enable && !config.boot.isContainer);
};
# Work around for https://github.com/NixOS/nixpkgs/issues/124215
documentation.info.enable = false;
environment = { environment = {
# Don't install the /lib/ld-linux.so.2 stub. This saves one instance of nixpkgs. # Don't install the /lib/ld-linux.so.2 stub. This saves one instance of nixpkgs.
ldso32 = null; ldso32 = null;
@ -65,6 +79,14 @@
]; ];
}; };
i18n = {
defaultLocale = "en_US.UTF-8";
extraLocaleSettings = {
LANGUAGE = "en_US.UTF-8";
LC_ALL = "en_US.UTF-8";
};
};
networking = { networking = {
nameservers = [ "127.0.0.1" ]; nameservers = [ "127.0.0.1" ];
# If using dhcpcd: # If using dhcpcd:
@ -203,7 +225,6 @@
# services."serial-getty@".environment.TERM = "xterm-256color"; # services."serial-getty@".environment.TERM = "xterm-256color";
}; };
system.activationScripts.update-diff = { system.activationScripts.update-diff = {
supportsDryActivation = true; supportsDryActivation = true;
text = '' text = ''
@ -214,18 +235,4 @@
fi fi
''; '';
}; };
boot = {
tmp = {
useTmpfs = true;
cleanOnBoot = true;
};
# kernelParams = [ "quiet" ];
consoleLogLevel = 0;
kernel.sysctl = { "vm.max_map_count" = 262144; };
initrd.systemd.enable = (!config.boot.swraid.enable && !config.boot.isContainer);
};
# Work around for https://github.com/NixOS/nixpkgs/issues/124215
documentation.info.enable = false;
} }

2
configs/user-gui.nix
View File

@ -56,7 +56,7 @@
keepassxc keepassxc
nextcloud-client nextcloud-client
pinta pinta
rustdesk-flutter rustdesk
simple-scan simple-scan
telegram-desktop telegram-desktop

42
flake.lock generated
View File

@ -9,11 +9,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1727292492, "lastModified": 1727620986,
"narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", "narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", "rev": "0eee1b2134e9aa3427081715ada883f3523a9608",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +32,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1726900127, "lastModified": 1727591515,
"narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "18eefba7fd0bf03e115785948758a44125a9fd68", "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726902823, "lastModified": 1727383923,
"narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "14929f7089268481d86b83ed31ffd88713dcd415", "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726902390, "lastModified": 1727453186,
"narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1727598569, "lastModified": 1727665282,
"narHash": "sha256-xGn/LxSQ+Ujnoeupc1ZzdQNal9qceHETcIGfwBZvz7Y=", "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e88d37154f74e2bc2545514612dd20a16bb3e2f0", "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726937504, "lastModified": 1727348695,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,11 +261,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726443025, "lastModified": 1727465975,
"narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", "rev": "546339a7be357b3e95fc4b79a8816dce540d477b",
"type": "github" "type": "github"
}, },
"original": { "original": {

0
home/bin/fzip
View File

75
machine/framework/configuration.nix
View File

@ -4,25 +4,6 @@ let
in in
{ {
nixpkgs = { nixpkgs = {
overlays = [
# outputs.overlays.additions
# outputs.overlays.modifications
# outputs.overlays.unstable-packages
# (self: super: {
# linuxPackages_latest = super.linuxPackages_latest.extend (lpself: lpsuper: {
# framework-laptop-kmod = super.linuxPackages_latest.framework-laptop-kmod.overrideAttrs (oldAttrs: rec {
# version = "0-unstable-latest";
# src = pkgs.fetchFromGitHub {
# owner = "DHowett";
# repo = "framework-laptop-kmod";
# rev = "6164bc3dec24b6bb2806eedd269df6a170bcc930";
# # sha256 = pkgs.lib.fakeSha256;
# hash = "sha256-OwtXQR0H4GNlYjVZ5UU5MEM6ZOjlV3B0x2auYawbS2U=";
# };
# });
# });
# })
];
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -124,10 +105,9 @@ in
users = [ "alex" ]; users = [ "alex" ];
}; };
opengl = { graphics = {
enable = true; enable = true;
driSupport = true; enable32Bit = true;
driSupport32Bit = true;
extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ]; extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ];
}; };
pulseaudio.enable = false; pulseaudio.enable = false;
@ -150,30 +130,30 @@ in
pulse.enable = true; pulse.enable = true;
}; };
samba = { # samba = {
enable = true; # enable = true;
securityType = "user"; # securityType = "user";
extraConfig = '' # extraConfig = ''
workgroup = WORKGROUP # workgroup = WORKGROUP
server string = server # server string = server
netbios name = server # netbios name = server
security = user # security = user
guest account = nobody # guest account = nobody
map to guest = bad user # map to guest = bad user
logging = systemd # logging = systemd
max log size = 50 # max log size = 50
''; # '';
shares = { # shares = {
storage = { # storage = {
path = "/home/alex/storage"; # path = "/home/alex/storage";
browseable = "yes"; # browseable = "yes";
"read only" = "no"; # "read only" = "no";
"guest ok" = "no"; # "guest ok" = "no";
"create mask" = "0644"; # "create mask" = "0644";
"directory mask" = "0755"; # "directory mask" = "0755";
}; # };
}; # };
}; # };
borgbackup.jobs.home = rec { borgbackup.jobs.home = rec {
compression = "auto,zstd"; compression = "auto,zstd";
@ -216,7 +196,6 @@ in
resources resources
monitorets monitorets
veracrypt
gnumake gnumake
pkg-config pkg-config
libftdi libftdi
@ -257,5 +236,5 @@ in
}; };
systemd.sleep.extraConfig = "HibernateDelaySec=60m"; systemd.sleep.extraConfig = "HibernateDelaySec=60m";
system.stateVersion = "24.05"; system.stateVersion = "24.11";
} }