Compare commits
3 commits
056661f6f8
...
a1d636e330
| Author | SHA1 | Date | |
|---|---|---|---|
a1d636e330
|
|||
|
772c6311d0
|
|||
|
2390273f53
|
18 changed files with 56 additions and 301 deletions
57
common.nix
57
common.nix
|
|
@ -12,29 +12,10 @@
|
|||
with lib;
|
||||
with builtins; {
|
||||
imports = [lix-module.nixosModules.default];
|
||||
nix = {
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-27.3.11"
|
||||
"nodejs-16.20.0"
|
||||
];
|
||||
};
|
||||
overlays = [rs-programs niri.overlays.niri];
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
overskride
|
||||
pulsemixer
|
||||
|
||||
htmlq
|
||||
|
||||
|
|
@ -88,18 +69,14 @@ with builtins; {
|
|||
];
|
||||
};
|
||||
|
||||
networking = {
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
services = {
|
||||
systemd-lock-handler.enable = true;
|
||||
openssh = {
|
||||
enable = true;
|
||||
# settings.PasswordAuthentication = false;
|
||||
# settings.KbdInteractiveAuthentication = false;
|
||||
settings.PasswordAuthentication = false;
|
||||
settings.KbdInteractiveAuthentication = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -116,31 +93,11 @@ with builtins; {
|
|||
|
||||
hardware.gpgSmartcards.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
home-manager.users.jade = {
|
||||
nixosConfig,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables.TZ = nixosConfig.time.timeZone;
|
||||
};
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
sudo = pkgs.sudo.override {withInsults = true;};
|
||||
};
|
||||
security.sudo.extraConfig = "Defaults insults";
|
||||
|
||||
boot.kernel.sysctl."vm.max_map_count" = 2147483642;
|
||||
|
||||
hardware = {
|
||||
uinput.enable = true;
|
||||
bluetooth.enable = true;
|
||||
# keyboard.uhk.enable = true;
|
||||
};
|
||||
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
security.rtkit.enable = true;
|
||||
|
|
@ -154,12 +111,4 @@ with builtins; {
|
|||
enable = true;
|
||||
algorithm = "zstd";
|
||||
};
|
||||
|
||||
users.defaultUserShell = pkgs.nushell;
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 60d";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
flake.lock
generated
28
flake.lock
generated
|
|
@ -424,19 +424,6 @@
|
|||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
}
|
||||
},
|
||||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1727366922,
|
||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
|
|
@ -495,18 +482,16 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1687903496,
|
||||
"narHash": "sha256-4PPwbFM4dNqso3zBya5rgfRvnBoIbN2J7qZ2ZpRyOUc=",
|
||||
"owner": "networkException",
|
||||
"lastModified": 1742806253,
|
||||
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "8e28b9ee431b265d1fc74b8b819ea0816344c4a1",
|
||||
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "networkException",
|
||||
"ref": "apple-t2-init",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
"id": "nixos-hardware",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
|
|
@ -659,7 +644,6 @@
|
|||
"fenix": "fenix",
|
||||
"home-manager": "home-manager",
|
||||
"lix-module": "lix-module",
|
||||
"mac-brcm-fw": "mac-brcm-fw",
|
||||
"niri": "niri",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
|
|
|
|||
43
flake.nix
43
flake.nix
|
|
@ -7,9 +7,8 @@
|
|||
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
|
||||
niri.url = "github:sodiboo/niri-flake";
|
||||
stylix.url = "github:danth/stylix";
|
||||
typst-within = {
|
||||
url = "github:schrottkatze/typst";
|
||||
};
|
||||
typst-within.url = "github:schrottkatze/typst";
|
||||
crane.url = "github:ipetkov/crane";
|
||||
lix-module = {
|
||||
url = "git+https://git.lix.systems/lix-project/nixos-module";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -18,14 +17,6 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init";
|
||||
mac-brcm-fw = {
|
||||
url = "path:/home/jade/nix-configs/mac-brcm-fw";
|
||||
flake = false;
|
||||
};
|
||||
crane = {
|
||||
url = "github:ipetkov/crane";
|
||||
};
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -41,7 +32,6 @@
|
|||
typst-within,
|
||||
home-manager,
|
||||
nixos-hardware,
|
||||
mac-brcm-fw,
|
||||
niri,
|
||||
stylix,
|
||||
fenix,
|
||||
|
|
@ -127,35 +117,6 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
potatobook-g = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs pkgs-unstable-small rs-programs lix-module niri;
|
||||
};
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
inputs.niri.nixosModules.niri
|
||||
stylix.nixosModules.stylix
|
||||
"${mac-brcm-fw}"
|
||||
./hosts/potatobook-g/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit pkgs-unstable-small pkgs-stable typst-within;
|
||||
};
|
||||
home-manager.users.jade = {
|
||||
nixosConfig,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables.TZ = nixosConfig.time.timeZone;
|
||||
home.stateVersion = "${nixosConfig.system.stateVersion}";
|
||||
};
|
||||
}
|
||||
nixos-hardware.nixosModules.apple-t2
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,7 @@
|
|||
# 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,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
{pkgs, ...}: {
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
"electron-27.3.11"
|
||||
|
|
@ -46,7 +41,6 @@
|
|||
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
services.blueman.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
gnome.gnome-keyring.enable = true;
|
||||
};
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
keyboard.uhk.enable = true;
|
||||
enableRedistributableFirmware = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
nix.settings = {
|
||||
trusted-substituters = [
|
||||
"https://t2linux.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw="
|
||||
];
|
||||
};
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../common.nix
|
||||
../../modules
|
||||
];
|
||||
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
jade = {
|
||||
flatpak.enable = true;
|
||||
desktop = {
|
||||
compositing.enable = true;
|
||||
syncthing.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
cloud.enable = true;
|
||||
social.enable = true;
|
||||
mail.enable = true;
|
||||
gaming.enable = true;
|
||||
evremap.enable = true;
|
||||
};
|
||||
terminal.enable = true;
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/".options = ["compress=zstd:3"];
|
||||
"/home".options = ["compress=zstd:3"];
|
||||
"/nix".options = ["compress=zstd:3" "noatime"];
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
services.libinput.touchpad = {
|
||||
disableWhileTyping = true;
|
||||
};
|
||||
|
||||
networking.hostName = "potatobook-g";
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/nix-direnv"
|
||||
];
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
||||
programs.adb.enable = true;
|
||||
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
programs.seahorse.enable = true;
|
||||
security.pam.services.jade.enableGnomeKeyring = true;
|
||||
|
||||
systemd.services."NetworkManager-wait-online".enable = false;
|
||||
|
||||
systemd.services = {
|
||||
create-swapfile = {
|
||||
serviceConfig.Type = "oneshot";
|
||||
wantedBy = ["swap-swapfile.swap"];
|
||||
script = ''
|
||||
swapfile="/swap/swapfile"
|
||||
if [[ -f "$swapfile" ]]; then
|
||||
echo "Swap file $swapfile already exists, taking no action"
|
||||
else
|
||||
echo "Setting up swap file $swapfile"
|
||||
${pkgs.coreutils}/bin/truncate -s 0 "$swapfile"
|
||||
${pkgs.e2fsprogs}/bin/chattr +C "$swapfile"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.logind.extraConfig = ''
|
||||
RuntimeDirectorySize=12G
|
||||
'';
|
||||
|
||||
# i rly should put that important big comment back here
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
# 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" "nvme" "usbhid" "uas" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/5F66-17ED";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swap/swapfile";
|
||||
size = 1024 * 12; # 12GB
|
||||
}
|
||||
];
|
||||
|
||||
# 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.enp2s0f1u1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
|
||||
<nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
|
||||
./configuration.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{...}: {}
|
||||
# dummy
|
||||
|
||||
|
|
@ -7,6 +7,6 @@
|
|||
./net
|
||||
./input
|
||||
./media
|
||||
./graphics.nix
|
||||
./nix.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@ with lib; {
|
|||
};
|
||||
|
||||
services.illum.enable = true;
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
services.smartd = {
|
||||
enable = true;
|
||||
notifications.test = true;
|
||||
|
|
|
|||
|
|
@ -11,10 +11,8 @@
|
|||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
pavucontrol
|
||||
volumeicon
|
||||
playerctl
|
||||
|
||||
pulsemixer
|
||||
helvum
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{...}: {
|
||||
time.timeZone = "Europe/Berlin";
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
{...}: {
|
||||
hardware.graphics.enable = true;
|
||||
}
|
||||
|
|
@ -5,7 +5,9 @@
|
|||
./eduroam.nix
|
||||
./dispatchers
|
||||
];
|
||||
networking.networkmanager.enable = true;
|
||||
networking.networkmanager.wifi.backend = "wpa_supplicant";
|
||||
|
||||
systemd.services."NetworkManager-wait-online".enable = false;
|
||||
services.mullvad-vpn.enable = true;
|
||||
home-manager.users.jade = {pkgs, ...}: {
|
||||
|
|
|
|||
29
modules/nix.nix
Normal file
29
modules/nix.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
rs-programs,
|
||||
niri,
|
||||
...
|
||||
}: {
|
||||
nix = {
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 60d";
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-27.3.11"
|
||||
"nodejs-16.20.0"
|
||||
];
|
||||
};
|
||||
overlays = [rs-programs niri.overlays.niri];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{...}: {
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./helix.nix
|
||||
./nu.nix
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
./git.nix
|
||||
./mprocs.nix
|
||||
./btop.nix
|
||||
./sudo.nix
|
||||
];
|
||||
programs.mosh.enable = true;
|
||||
programs.bat.enable = true;
|
||||
|
|
@ -14,4 +15,6 @@
|
|||
programs.carapace.enable = true;
|
||||
programs.direnv.enable = true;
|
||||
};
|
||||
|
||||
users.defaultUserShell = pkgs.nushell;
|
||||
}
|
||||
|
|
|
|||
6
modules/shell/sudo.nix
Normal file
6
modules/shell/sudo.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{...}: {
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
sudo = pkgs.sudo.override {withInsults = true;};
|
||||
};
|
||||
security.sudo.extraConfig = "Defaults insults";
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue