pestctrl/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade to 24.05?

Browse source
This commit is contained in:
Benson Chu 2024-07-02 14:13:32 -05:00
parent 4f84bef212
commit fd7b6bc4fc
13 changed files with 71 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/configuration.nix
View file

@ -94,6 +94,6 @@ in
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

2
common/development-machine.nix
View file

@ -28,7 +28,7 @@
rizin rizin
cutter cutter
nodejs_21 nodejs_22
minikube minikube
kubectl kubectl

15
common/exwm.nix
View file

@ -8,9 +8,6 @@
]; ];
services.xserver = { services.xserver = {
displayManager = {
defaultSession = "none+my-exwm";
};
windowManager.session = [{ windowManager.session = [{
name = "my-exwm"; name = "my-exwm";
@ -18,14 +15,24 @@
${pkgs.emacs-unstable}/bin/emacs -l /home/benson/.emacs.d/init.el ${pkgs.emacs-unstable}/bin/emacs -l /home/benson/.emacs.d/init.el
''; '';
}]; }];
# gpg-agent = {
# enable = true;
# pinentryFlavor = "gtk2";
# };
};
services.displayManager = {
defaultSession = "none+my-exwm";
}; };
programs = { programs = {
nm-applet.enable = true; nm-applet.enable = true;
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
pinentryFlavor = "gtk2";
enableSSHSupport = true; enableSSHSupport = true;
pinentryPackage = pkgs.pinentry-gtk2;
}; };
}; };

2
common/moms-house/printer.nix
View file

@ -16,7 +16,7 @@
# Enable auto-discovery of printers # Enable auto-discovery of printers
avahi = { avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
}; };

33
common/user-facing.nix
View file

@ -31,23 +31,28 @@
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
# Enable sddm # Enable sddm and startx
displayManager = { displayManager = {
sddm.enable = true;
startx.enable = true; startx.enable = true;
}; };
# Configure keymap in X11 # Configure keymap in X11
xkb = {
layout = "us"; layout = "us";
xkbVariant = ""; variant = "";
};
};
libinput = { services.displayManager = {
sddm.enable = true;
};
services.libinput = {
enable = true; enable = true;
touchpad = { touchpad = {
naturalScrolling = true; naturalScrolling = true;
}; };
}; };
};
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
@ -90,14 +95,16 @@
yt-dlp yt-dlp
dconf dconf
(beets.override { # TODO: Re-enable extrafiles
pluginOverrides = { (beets# .override {
extrafiles = { # pluginOverrides = {
enable = true; # extrafiles = {
propagatedBuildInputs = [ beetsPackages.extrafiles ]; # enable = true;
}; # propagatedBuildInputs = [ beetsPackages.extrafiles ];
}; # };
}) # };
# }
)
(gnuplot.override { withQt = true; }) (gnuplot.override { withQt = true; })
]; ];

48
flake.lock
View file

@ -11,11 +11,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1721552966, "lastModified": 1722791415,
"narHash": "sha256-zvzQgQEMxTaRpvtHlsNMjgdOiOvexfCE2hRaadSS6OY=", "narHash": "sha256-7n9UqBkTAF/RikFzCyHKz50kzBDF5GYgVb3J5wCh4EY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ab15d82f94c8f6373fec1f363c5b6c631453950b", "rev": "c4f6796e5c499cf6370a45fff08a03e848b9abad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,27 +50,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719827415, "lastModified": 1720042825,
"narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1711352745, "lastModified": 1722332872,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,27 +82,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1722651103,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1721409541, "lastModified": 1722651103,
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1722630782,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,16 +156,16 @@
}, },
"update": { "update": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1722651103,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

6
flake.nix
View file

@ -1,14 +1,14 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
update.url = "github:nixos/nixpkgs/nixos-23.11"; update.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = { emacs-overlay = {

2
home/users/benson.nix
View file

@ -23,7 +23,7 @@
# You should not change this value, even if you update Home Manager. If you do # You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager # want to update the value, then make sure to first check the Home Manager
# release notes. # release notes.
home.stateVersion = "23.11"; # Please read the comment before changing. home.stateVersion = "24.05"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.

2
home/users/work.nix
View file

@ -25,7 +25,7 @@
# You should not change this value, even if you update Home Manager. If you do # You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager # want to update the value, then make sure to first check the Home Manager
# release notes. # release notes.
home.stateVersion = "23.11"; # Please read the comment before changing. home.stateVersion = "24.05"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.

2
hosts/NixDawn/configuration.nix
View file

@ -154,6 +154,6 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

2
hosts/NixFrame/configuration.nix
View file

@ -64,6 +64,6 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

2
hosts/NixGate/configuration.nix
View file

@ -104,5 +104,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }

2
hosts/NixSentinel/configuration.nix
View file

@ -129,6 +129,6 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
} }