cspark
/
Personal-NixOS-Configuration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: cspark:a4ed545fcf86a2f40e86c24f9dabcb4f4cf93b1e
Branches Tags
cspark:master
..
compare: cspark:85c4601cce94ae002f0c5236511023584b107069
Branches Tags
cspark:master

No commits in common. "a4ed545fcf86a2f40e86c24f9dabcb4f4cf93b1e" and "85c4601cce94ae002f0c5236511023584b107069" have entirely different histories.
a4ed545fcf ... 85c4601cce

6 changed files with 37 additions and 44 deletions
Show Stats Expand all files Collapse all files

2
configurations/laptop-elitebook/configuration.nix
View File

@ -19,8 +19,6 @@
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# For encrypted swap
boot.initrd.luks.devices."luks-fd72f03a-6e52-47d9-a863-0c77c02f249e".device = "/dev/disk/by-uuid/fd72f03a-6e52-47d9-a863-0c77c02f249e";
networking.hostName = "cspark-nixos-elitebook"; # Define your hostname. networking.hostName = "cspark-nixos-elitebook"; # Define your hostname.

19
configurations/laptop-elitebook/hardware-configuration.nix
View File

@ -8,26 +8,26 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/13f69aad-3256-4c44-bbbd-02a6daad8efc"; { device = "/dev/disk/by-uuid/502edf37-4301-4517-87dd-4b030310f869";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-0d23e4b7-411b-4904-b19d-25af0a16c541".device = "/dev/disk/by-uuid/0d23e4b7-411b-4904-b19d-25af0a16c541"; boot.initrd.luks.devices."luks-a014fc29-65ec-4cbc-9ef2-d601c5157425".device = "/dev/disk/by-uuid/a014fc29-65ec-4cbc-9ef2-d601c5157425";
boot.initrd.luks.devices."luks-5917f8ad-73ed-4839-ba81-be53a90685a1".device = "/dev/disk/by-uuid/5917f8ad-73ed-4839-ba81-be53a90685a1";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/11DB-A717"; { device = "/dev/disk/by-uuid/F323-67BC";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/1a9fee73-d832-4d65-9b57-9da5673e2044"; } [ { device = "/dev/disk/by-uuid/aa1c6777-0afa-4fdf-84e8-5fead5e987d4"; }
]; ];
# 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
@ -35,8 +35,9 @@
# 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.wlp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s25.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.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

50
flake.lock
View File

@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764998300, "lastModified": 1764194569,
"narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,11 +111,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1765008770, "lastModified": 1764165116,
"narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "935080f54490e3e7b1eda731cbe1478744546ea8", "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764966114, "lastModified": 1764160906,
"narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1764841794, "lastModified": 1763964548,
"narHash": "sha256-TcJ2kgFn8qbbNCh7HJLadi4ZvW9CFrbLB02VS7biWlo=", "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "514db907c8a0b32a0bdc1678d480a5278da4b679", "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1763966396,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,16 +210,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1764831616, "lastModified": 1763948260,
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -403,11 +403,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764721075, "lastModified": 1763704521,
"narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764745188, "lastModified": 1763809017,
"narHash": "sha256-9H1Izl1vxZVYG/6AQXfl8tyBYDx+KhB0enpjTq2tAT4=", "narHash": "sha256-mv13dHeIA4cWHZRmFKIF11s7keVP9NhVtpaAYKX40jk=",
"owner": "Benexl", "owner": "Benexl",
"repo": "yt-x", "repo": "yt-x",
"rev": "ba700d7c647bc629ca431f4b9ea4dc48c89c6392", "rev": "efe0465cdf54d13c0606b76780046ab6ecc60a6c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/nixos/cspark-desktop-niri/home.nix
View File

@ -33,7 +33,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
(writeShellScriptBin "niri-autostart" (writeShellScriptBin "niri-autostart"
'' ''
[[ ! $(hostname) == *"desktop"* ]] && waybar & [[ $(hostname) == *"laptop"* ]] && waybar &
mako & mako &
#swaybg -i $(find ${config.home.homeDirectory}/Pictures/Wallpapers/ggg/. -type f | shuf -n1) -m stretch & #swaybg -i $(find ${config.home.homeDirectory}/Pictures/Wallpapers/ggg/. -type f | shuf -n1) -m stretch &
swaybg -i ${config.home.homeDirectory}/Pictures/Wallpapers/solarisdolphins_olive.png -m tile & swaybg -i ${config.home.homeDirectory}/Pictures/Wallpapers/solarisdolphins_olive.png -m tile &

5
modules/nixos/cspark-desktop-niri/module.nix
View File

@ -16,10 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Enable the Niri Compositor and add extra system packages. # Enable the Niri Compositor and add extra system packages.
programs.niri = { programs.niri.enable = true;
enable = true;
package = pkgs.niri;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wl-clipboard wl-clipboard
swaylock # Locking swaylock # Locking

3
modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl
View File

@ -334,9 +334,6 @@ binds {
XF86AudioMicMute allow-when-locked=true { spawn "toggle-mic"; } XF86AudioMicMute allow-when-locked=true { spawn "toggle-mic"; }
Alt+Delete allow-when-locked=true { spawn "toggle-mic"; } Alt+Delete allow-when-locked=true { spawn "toggle-mic"; }
XF86MonBrightnessUp allow-when-locked=true { spawn "sudo" "light" "-A" "10"; }
XF86MonBrightnessDown allow-when-locked=true { spawn "sudo" "light" "-U" "10"; }
Alt+W { close-window; } Alt+W { close-window; }
Alt+Left { focus-column-left; } Alt+Left { focus-column-left; }