gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: gerg-l:6623e4fd471b9ce83ce836024023436241673e1a
Branches Tags
gerg-l:master
..
compare: gerg-l:037d12214d5175f181fb5012d864d0863f380458
Branches Tags
gerg-l:master

4 commits
6623e4fd47 ... 037d12214d

Author SHA1 Message Date
Gerg-L
037d12214d
fix: substituters can't be a negative value 2025-03-30 19:21:49 -04:00
Gerg-L
df81b3dc48
fix: displayManager.defaultSession rename 2025-03-30 19:09:09 -04:00
Gerg-L
f8d91c0555
chore: clean up media-laptop 
feat: use priority for substituters

feat: switch to mpv
 2025-03-30 18:55:05 -04:00
Gerg-L
f44bbc9857
chore: update nix 2025-03-30 18:55:05 -04:00
7 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -452,16 +452,16 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1740601978, "lastModified": 1742837300,
"narHash": "sha256-b70oopwDPaHiddorJIvI8H50yTXOd04noGZVp3YPHbM=", "narHash": "sha256-pidBRgonX1k7NJ1K8ML0rX1WWrAuYlGmQWz2xKXyEFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "31923aaac0358336442244ec6baf8f6517463afd", "rev": "5a4e306cc5853922b292525ed23c59ba07f9d243",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "31923aaac0358336442244ec6baf8f6517463afd", "ref": "5a4e306cc5853922b292525ed23c59ba07f9d243",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -24,7 +24,7 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
ref = "31923aaac0358336442244ec6baf8f6517463afd"; ref = "5a4e306cc5853922b292525ed23c59ba07f9d243";
inputs.nixpkgs.follows = "stable"; inputs.nixpkgs.follows = "stable";
}; };
#other #other

2
nixosConfigurations/gerg-desktop/main.nix
View file

@ -28,7 +28,7 @@
qbittorrent # steal stuff qbittorrent # steal stuff
pavucontrol # gui volume control pavucontrol # gui volume control
pcmanfm # file manager pcmanfm # file manager
vlc # play stuff mpv # play stuff
ripgrep ripgrep
fd fd
jq jq

40
nixosConfigurations/media-laptop/main.nix
View file

@ -15,26 +15,29 @@
}; };
packages = { packages = {
inherit (pkgs) inherit (pkgs)
vlc mpv
pavucontrol # gui volume control pavucontrol # gui volume control
chromium librewolf
; ;
inherit (nvim-flake.packages) neovim; inherit (nvim-flake.packages) neovim;
}; };
}; };
services.xserver.videoDrivers = [ "modesetting" ]; services = {
xserver.videoDrivers = [ "modesetting" ];
networking.networkmanager.enable = true; displayManager.autoLogin = {
boot.kernelPackages = pkgs.linuxPackages_latest;
sops.secrets.root.neededForUsers = true;
services.displayManager.autoLogin = {
enable = true; enable = true;
user = "media"; user = "media";
}; };
openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
};
networking = {
networkmanager.enable = true;
hostName = "media-laptop";
};
sops.secrets.root.neededForUsers = true;
users = { users = {
mutableUsers = false; mutableUsers = false;
users = { users = {
@ -53,8 +56,9 @@
}; };
}; };
}; };
services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
initrd.availableKernelModules = [ initrd.availableKernelModules = [
"xhci-pci" "xhci-pci"
"ehci-pci" "ehci-pci"
@ -66,19 +70,19 @@
]; ];
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
}; };
systemd.user.tmpfiles.users.media.rules = [ systemd.user.tmpfiles.users.media.rules = [
"L+ %h/Desktop/chromium-browser.desktop - - - - ${pkgs.chromium}/share/applications/chromium-browser.desktop" "L+ %h/Desktop/librewolf.desktop - - - - ${pkgs.librewolf}/share/applications/librewolf.desktop"
"L+ %h/Desktop/vlc.desktop - - - - ${pkgs.vlc}/share/applications/vlc.desktop"
]; ];
system.stateVersion = "24.11"; # Reformat at some point
networking.hostName = "media-laptop";
nixpkgs.hostPlatform = "x86_64-linux";
swapDevices = [ swapDevices = [
{ {
device = "/swapfile"; device = "/swapfile";
size = 8 * 1024; size = 8 * 1024;
} }
]; ];
system.stateVersion = "24.11";
nixpkgs.hostPlatform = "x86_64-linux";
} }

4
nixosModules/DE/xfce.nix
View file

@ -8,12 +8,14 @@
config = lib.mkIf config.local.DE.xfce.enable { config = lib.mkIf config.local.DE.xfce.enable {
environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ]; environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
services.xserver = { services = {
xserver = {
enable = true; enable = true;
desktopManager.xfce = { desktopManager.xfce = {
enable = true; enable = true;
enableScreensaver = true; enableScreensaver = true;
}; };
};
displayManager.defaultSession = "xfce"; displayManager.defaultSession = "xfce";
}; };
}; };

2
nixosModules/builders.nix
View file

@ -10,7 +10,7 @@
keep-derivations = false; keep-derivations = false;
builders-use-substitutes = true; builders-use-substitutes = true;
max-jobs = 0; max-jobs = 0;
substituters = [ "https://cache.gerg-l.com" ]; substituters = lib.mkForce [ "https://cache.gerg-l.com?priority=1&compression=zstd" ];
trusted-public-keys = [ "cache.gerg-l.com:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ]; trusted-public-keys = [ "cache.gerg-l.com:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ];
}; };
distributedBuilds = true; distributedBuilds = true;

5
nixosModules/nix.nix
View file

@ -31,8 +31,9 @@
# Other nix settings # Other nix settings
# #
settings = { settings = {
substituters = [ substituters = lib.mkForce [
"https://nix-community.cachix.org" "https://cache.nixos.org?priority=2"
"https://nix-community.cachix.org?priority=3"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="