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

20 current 2025-04-27 16:44:06 25.05.20250424.f771eb4 6.12.24 *

Browse Source
This commit is contained in:
JakeGinesin
2025-04-27 16:44:10 -04:00
parent 0a0b510617
commit 4216730c15
9 changed files with 65 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configuration.nix
View File

@@ -14,14 +14,25 @@
old-nitrogen = pkg_with_working_nitrogen.nitrogen; old-nitrogen = pkg_with_working_nitrogen.nitrogen;
in { in {
imports = [ imports = [
# ./hardware-configuration.nix ./hardware-configuration.nix
./system/system.nix ./system/system.nix
]; ];
# Bootloader. # Bootloader.
boot.loader.grub.enable = true; # boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/nvme0n1"; # boot.loader.grub.device = "/dev/sda";
boot.loader.grub.useOSProber = true; # boot.loader.grub.useOSProber = true;
# boot.loader.grub.version = 2;
#boot = {
# loader.systemd-boot = {
# enable = true;
# editor = false;
# };
# kernelPackages = pkgs.linuxPackages;
#};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.grub.enable = false;
networking.hostName = "thonkpad"; # Define your hostname. networking.hostName = "thonkpad"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@@ -72,6 +83,7 @@ in {
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
programs.dconf.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;

33
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1743550720,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734622215, "lastModified": 1745703610,
"narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "narHash": "sha256-KgaGPlmjJItZ+Xf8mSoRmrsso+sf3K54n9oIP9Q17LY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "rev": "2f5819a962489e037a57835f63ed6ff8dbc2d5fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1745526057,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -56,14 +56,17 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1743296961,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "repo": "nixpkgs.lib",
"type": "github"
} }
}, },
"root": { "root": {

14
hardware-configuration.nix
View File

@@ -12,16 +12,22 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/05ca9d56-3506-43c5-b9ec-be928b782996"; device = "/dev/disk/by-uuid/aa4ec46a-b4aa-4a7c-a016-7d6e224cd7ba";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/CCA5-0BDD";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = []; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -29,8 +35,8 @@
# still possible to use this option, but it's recommended to use it in conjunction # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

1
home/home.nix
View File

@@ -30,6 +30,7 @@ in {
EDITOR = "nvim"; EDITOR = "nvim";
HOME = "/home/synchronous"; HOME = "/home/synchronous";
XDG_CACHE_HOME = "$HOME/.cache"; XDG_CACHE_HOME = "$HOME/.cache";
DBUS_SESSION_BUS_ADDRESS = "unix:path=$XDG_RUNTIME_DIR/bus";
}; };
programs.home-manager.enable = true; programs.home-manager.enable = true;

2
home/services/services.nix
View File

@@ -6,6 +6,6 @@
imports = [ imports = [
./picom/default.nix ./picom/default.nix
./dunst/default.nix ./dunst/default.nix
./gpg-agent/default.nix # ./gpg-agent/default.nix
]; ];
} }

25
nixos-switch.log
View File

@@ -1,25 +0,0 @@
warning: Path '/home/synchronous/nix-cfg/flake.nix' should point at the directory containing the 'flake.nix' file, not the file itself. Pretending that you meant '/home/synchronous/nix-cfg'
warning: Git tree '/home/synchronous/nix-cfg' is dirty
error:
… while calling the 'seq' builtin
at /nix/store/6zgbbqlr7nnfxpzkyj7fsl4fpg89jbw0-source/lib/modules.nix:334:18:
333| options = checked options;
334| config = checked (removeAttrs config [ "_module" ]);
| ^
335| _module = checked (config._module);
… while evaluating a branch condition
at /nix/store/6zgbbqlr7nnfxpzkyj7fsl4fpg89jbw0-source/lib/modules.nix:273:9:
272| checkUnmatched =
273| if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then
| ^
274| let
(stack trace truncated; use '--show-trace' to show the full, detailed trace)
error: syntax error, unexpected ';'
at /nix/store/f06nazkwk5a29vz793alp0zppviacn27-source/configuration.nix:142:7:
141| }
142| ];;;
| ^
143| };

14
system/hardware/configuration/hardware-configuration.nix
View File

@@ -12,16 +12,22 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/05ca9d56-3506-43c5-b9ec-be928b782996"; device = "/dev/disk/by-uuid/aa4ec46a-b4aa-4a7c-a016-7d6e224cd7ba";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/CCA5-0BDD";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = []; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -29,8 +35,8 @@
# still possible to use this option, but it's recommended to use it in conjunction # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

2
system/hardware/hardware.nix
View File

@@ -4,7 +4,7 @@
... ...
}: { }: {
imports = [ imports = [
./configuration/hardware-configuration.nix # ./configuration/hardware-configuration.nix
./power-management/default.nix ./power-management/default.nix
]; ];
} }

38
system/xserver/default.nix
View File

@@ -4,51 +4,29 @@
... ...
}: { }: {
# services.xserver.dpi = 180; # services.xserver.dpi = 180;
# services.dbus.enable = true;
security.polkit.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
xkb.layout = "us"; xkb.layout = "us";
xkb.variant = ""; xkb.variant = "";
# displayManager.defaultSession = "bspwm"; displayManager.defaultSession = "none+bspwm";
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
windowManager.bspwm.enable = true; windowManager.bspwm.enable = true;
# windowManager.bspwm = {
# enable = true;
# # extraConfig = builtins.readFile ./bspwmrc;
# # configFile = ./bspwmrc; # relative import to preserve locality of config
# # package = "bspwm-unstable";
# # sxhkd.package = "sxhkd-unstable";
# # sxhkd.configFile = ./sxhkdrc;
# };
displayManager = { displayManager = {
# autoLogin.user = "synchronous"; # autoLogin.user = "synchronous";
# autoLogin.enable = true; # autoLogin.enable = true;
lightdm = { # lightdm = {
# enable = true;
# greeters.gtk.enable = true;
# };
sddm = {
enable = true; enable = true;
greeters.gtk.enable = true;
}; };
}; };
}; };
# xsession.windowManager.bspwm = {
# enable = true;
# extraConfig = builtins.readFile ./bspwmrc;
# };
# services.sxhkd.enable = true;
# services.sxhkd.extraConfig = builtins.readFile ./sxhkdrc;
# services.displayManager.autoLogin.enable = true;
# services.displayManagrer.sddm.enable = true;
# services.desktopManager.plasma6.enable = true;
# services.xserver.xkb = {
# layout = "us";
# variant = "";
# }
} }