michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: upgrade to nixos 24.11

Browse Source
This commit is contained in:
Michael Thomas 2024-12-22 15:03:39 -05:00
parent b4ea5e4085
commit a1e088fb35
6 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock generated
View File

@ -333,16 +333,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1734366194,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rycee", "owner": "rycee",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -498,16 +498,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734529975, "lastModified": 1734737257,
"narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"type": "indirect" "type": "indirect"
} }
}, },

4
flake.nix
View File

@ -2,13 +2,13 @@
description = "Michael Thomas's NixOS configuration"; description = "Michael Thomas's NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "nixpkgs/nixos-24.11";
unstable.url = "nixpkgs/nixos-unstable"; unstable.url = "nixpkgs/nixos-unstable";
master.url = "github:NixOS/nixpkgs"; master.url = "github:NixOS/nixpkgs";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
home-manager = { home-manager = {
url = "github:rycee/home-manager/release-24.05"; url = "github:rycee/home-manager/release-24.11";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };

2
machines/kitchen/configuration.nix
View File

@ -19,8 +19,6 @@
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
micro
gnome.gnome-tweaks
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

1
modules/sound.nix
View File

@ -1,6 +1,5 @@
{ {
# Enable sound. # Enable sound.
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;

26
nixos/hyprland/default.nix
View File

@ -29,19 +29,19 @@ in {
adw-gtk3 adw-gtk3
# Applications # Applications
gnome.nautilus nautilus
gnome.sushi sushi
gnome.eog eog
gnome.totem totem
gnome.cheese cheese
gnome.file-roller file-roller
gnome.gnome-weather gnome-weather
gnome.gnome-contacts gnome-contacts
gnome.gnome-calendar gnome-calendar
gnome.gnome-screenshot gnome-screenshot
gnome.gnome-dictionary wordbook
gnome.gnome-font-viewer gnome-font-viewer
gnome.gnome-system-monitor gnome-system-monitor
monophony # music player monophony # music player
# Nvim clipboard # Nvim clipboard

24
nixos/hyprland/home.nix
View File

@ -23,10 +23,7 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
settings = let settings = {
# No gaps or border when only one window
no_gaps_when_only = 1;
in {
"$mod" = "SUPER"; "$mod" = "SUPER";
general = { general = {
gaps_in = 5; gaps_in = 5;
@ -36,12 +33,6 @@ in {
follow_mouse = 2; follow_mouse = 2;
sensitivity = -0.2; sensitivity = -0.2;
}; };
dwindle = {
inherit no_gaps_when_only;
};
master = {
inherit no_gaps_when_only;
};
exec-once = [ exec-once = [
"hyprctl setcursor Adwaita 24" "hyprctl setcursor Adwaita 24"
"ags" "ags"
@ -112,6 +103,17 @@ in {
# mouse bindings # mouse bindings
bindm=ALT,mouse:272,movewindow bindm=ALT,mouse:272,movewindow
bindm=ALT,mouse:273,resizewindow bindm=ALT,mouse:273,resizewindow
# no gaps when only window
workspace = w[t1], gapsout:0, gapsin:0
workspace = w[tg1], gapsout:0, gapsin:0
workspace = f[1], gapsout:0, gapsin:0
windowrulev2 = bordersize 0, floating:0, onworkspace:w[t1]
windowrulev2 = rounding 0, floating:0, onworkspace:w[t1]
windowrulev2 = bordersize 0, floating:0, onworkspace:w[tg1]
windowrulev2 = rounding 0, floating:0, onworkspace:w[tg1]
windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
''; '';
}; };
@ -131,7 +133,7 @@ in {
home.pointerCursor = { home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
name = "Adwaita"; name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
size = 24; size = 24;
}; };