Upgraded to 24.11 Vicuña
This commit is contained in:
parent
fb8d2c04e8
commit
27a59191e7
@ -203,5 +203,5 @@ in
|
|||||||
|
|
||||||
logiops
|
logiops
|
||||||
];
|
];
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.11"; # Did you read the comment?
|
||||||
}
|
}
|
||||||
|
|||||||
16
flake.lock
generated
16
flake.lock
generated
@ -189,16 +189,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726989464,
|
"lastModified": 1733482664,
|
||||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
"narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
"rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.05",
|
"ref": "release-24.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -320,16 +320,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731797254,
|
"lastModified": 1733261153,
|
||||||
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
|
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
|
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,11 +4,11 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
# Switched to unstable 10/13/24 Generation 109 and below stable
|
# Switched to unstable 10/13/24 Generation 109 and below stable
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
legacy.url = "github:NixOS/nixpkgs-channels";
|
legacy.url = "github:NixOS/nixpkgs-channels";
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
@ -87,7 +87,8 @@
|
|||||||
timezone = "America/Los_Angeles";
|
timezone = "America/Los_Angeles";
|
||||||
locale = "en_US.UTF-8";
|
locale = "en_US.UTF-8";
|
||||||
gpuType = "nvidia";
|
gpuType = "nvidia";
|
||||||
version = "24.05";
|
version = "24.11";
|
||||||
|
name = "Vicuña";
|
||||||
};
|
};
|
||||||
userSettings = {
|
userSettings = {
|
||||||
username = "wayne";
|
username = "wayne";
|
||||||
|
|||||||
@ -216,5 +216,5 @@ in
|
|||||||
|
|
||||||
systemd.user.startServices = "sd-switch";
|
systemd.user.startServices = "sd-switch";
|
||||||
|
|
||||||
home.stateVersion = "24.05";
|
home.stateVersion = "24.11";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@ with pkgs;
|
|||||||
[
|
[
|
||||||
wdisplays waybar wlogout wayland-utils wayland-protocols
|
wdisplays waybar wlogout wayland-utils wayland-protocols
|
||||||
hyprpaper hyprlock hypridle hyprshot hyprpicker hyprcursor
|
hyprpaper hyprlock hypridle hyprshot hyprpicker hyprcursor
|
||||||
pyprland
|
pyprland iniparser
|
||||||
rofi-wayland wev clipman cliphist wl-clip-persist wl-clipboard
|
rofi-wayland wev clipman cliphist wl-clip-persist wl-clipboard
|
||||||
blueman networkmanagerapplet swayosd
|
blueman networkmanagerapplet swayosd
|
||||||
qalculate-qt
|
qalculate-qt
|
||||||
|
|||||||
@ -86,7 +86,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -126,7 +126,7 @@
|
|||||||
extraPackages = with pkgs; [ gcc gnumake ];
|
extraPackages = with pkgs; [ gcc gnumake ];
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -181,7 +181,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -226,7 +226,7 @@
|
|||||||
examplePort = 8001;
|
examplePort = 8001;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -322,7 +322,7 @@
|
|||||||
php83 php83Packages.composer nodejs_22 vim git
|
php83 php83Packages.composer nodejs_22 vim git
|
||||||
];
|
];
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -555,7 +555,7 @@
|
|||||||
mailpit
|
mailpit
|
||||||
]);
|
]);
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -87,13 +87,6 @@
|
|||||||
};
|
};
|
||||||
debug = { disable_logs = false; };
|
debug = { disable_logs = false; };
|
||||||
xwayland = { force_zero_scaling = true; };
|
xwayland = { force_zero_scaling = true; };
|
||||||
binddevice = "hanvon-ugee-shortcut-remote-keyboard, CTRL+o, exec, hyprctl dispatch key Page_Down";
|
|
||||||
# hanvon-ugee-shortcut-remote key bindings
|
|
||||||
# bindl = [
|
|
||||||
# "DEVICE:hanvon-ugee-shortcut-remote-keyboard, CTRL, o, exec, firefox-pageup"
|
|
||||||
# "DEVICE:hanvon-ugee-shortcut-remote, , F5, exec, firefox-pagedown"
|
|
||||||
# ];
|
|
||||||
# Binding for remapping CTRL+o to PageDown on the remote
|
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mod, mouse:272, movewindow"
|
"$mod, mouse:272, movewindow"
|
||||||
"$mod, Control_L, movewindow"
|
"$mod, Control_L, movewindow"
|
||||||
@ -299,30 +292,43 @@
|
|||||||
"opacity 1 override 0.9 override 0.9 override, ^(zen-alpha)$" # set opacity to 1.0 active, 0.5 inactive and 0.8 fullscreen for kitty
|
"opacity 1 override 0.9 override 0.9 override, ^(zen-alpha)$" # set opacity to 1.0 active, 0.5 inactive and 0.8 fullscreen for kitty
|
||||||
# "opacity 1.0 override 0.5 override 0.8 override, ^(kitty)$" # set opacity to 1.0 active, 0.5 inactive and 0.8 fullscreen for kitty
|
# "opacity 1.0 override 0.5 override 0.8 override, ^(kitty)$" # set opacity to 1.0 active, 0.5 inactive and 0.8 fullscreen for kitty
|
||||||
"move -50% -50%, float, ^(org.keepassxc.KeePassXC)$"
|
"move -50% -50%, float, ^(org.keepassxc.KeePassXC)$"
|
||||||
", float, ^(Nextcloud)$"
|
"float, ^(Nextcloud)$"
|
||||||
# common modals
|
# common modals
|
||||||
"center,title:^(Open).*$"
|
## "center,title:^(Open).*$"
|
||||||
# "center,title:^(Choose Files)$"
|
# "center,title:^(Choose Files)$"
|
||||||
"center,title:^(Save).*$"
|
## "center,title:^(Save).*$"
|
||||||
# "center,title:^(Confirm to replace files)$"
|
# "center,title:^(Confirm to replace files)$"
|
||||||
# "center,title:^(File Operation Progress)$"
|
# "center,title:^(File Operation Progress)$"
|
||||||
|
"opacity 1.0 override 1 override 1 override, ^(REAPER)$"
|
||||||
];
|
];
|
||||||
|
|
||||||
windowrulev2 = [
|
windowrulev2 = [
|
||||||
# "workspace 7,class:dropdown_menu_class"
|
"minsize 1 1, class:^(sublime_text)$"
|
||||||
# "workspace 8,class:dropdown_menu_class"
|
|
||||||
# "workspace 9,class:dropdown_menu_class"
|
# REAPER Rules
|
||||||
# "move cursor 5px 15px, class:sublime_text"
|
# Drop down menus are very wonly and require special attention
|
||||||
"minsize 1 1, class:sublime_text"
|
# They only work in fullscreen but if we initially set fullscreen
|
||||||
|
# Reaper floats when we select from the toolbar?!!!
|
||||||
|
# We initially tile the window then fullscreen it to make toolbar menus work
|
||||||
|
"tile, class:^(REAPER)$"
|
||||||
|
"monitor DP-5, class:^(REAPER)$"
|
||||||
|
"workspace 3, class:^(REAPER)$"
|
||||||
|
# The following 3 lines make Dropdowns work
|
||||||
|
"float, title:^(menu)$, class:^(REAPER)$" # Important
|
||||||
|
"minsize 1 1, title:^(menu)$, class:^(REAPER)$" # Important
|
||||||
|
"move onscreen cursor, title:^(menu)$, class:^(REAPER)$" # Important
|
||||||
|
|
||||||
|
# "focusonactivate, class:(REAPER)"
|
||||||
|
# "allowsinput, class:(REAPER)"
|
||||||
|
# "focusonactivate, class:(REAPER), title(menu)"
|
||||||
|
# "stayfocused, title:^(menu)$, class:^(REAPER)$" # Order is important
|
||||||
|
|
||||||
# "float, class:REAPER"
|
# "float, class:REAPER"
|
||||||
# "move cursor 5px 15px, class:REAPER"
|
# "move cursor 5px 15px, class:REAPER"
|
||||||
"minsize 1 1, class:REAPER"
|
|
||||||
# "stayfocused, class:REAPER"
|
|
||||||
# Apply stayfocused only to transient (temporary) windows in Reaper
|
# Apply stayfocused only to transient (temporary) windows in Reaper
|
||||||
# "stayfocused, title:^(.*)$, class:REAPER"
|
# "stayfocused, title:^(.*)$, class:REAPER"
|
||||||
# "stayfocused, parent:REAPER"
|
# "stayfocused, parent:REAPER"
|
||||||
"noswallow, class:REAPER"
|
# "noswallow, class:REAPER"
|
||||||
# "stayfocused, title:^(.*)$, class:REAPER"
|
# "stayfocused, title:^(.*)$, class:REAPER"
|
||||||
# "float, title:^(Open|Choose Files|Save As|Confirm to replace files|File Operation Progress)$, class:REAPER"
|
# "float, title:^(Open|Choose Files|Save As|Confirm to replace files|File Operation Progress)$, class:REAPER"
|
||||||
# "stayfocused, title:^(Open|Choose Files|Save As|Confirm to replace files|File Operation Progress)$, class:REAPER"
|
# "stayfocused, title:^(Open|Choose Files|Save As|Confirm to replace files|File Operation Progress)$, class:REAPER"
|
||||||
@ -332,12 +338,12 @@
|
|||||||
# "float,class:^(google-chrome)$,title:^(Open Files)$"
|
# "float,class:^(google-chrome)$,title:^(Open Files)$"
|
||||||
# "float,class:^(google-chrome)$,title:^(Open File)$"
|
# "float,class:^(google-chrome)$,title:^(Open File)$"
|
||||||
"float,class:^(Typora)$,title:^(Open File)$"
|
"float,class:^(Typora)$,title:^(Open File)$"
|
||||||
"float,class:com.nextcloud.desktopclient.nextcloud"
|
"float,class:^(com.nextcloud.desktopclient.nextcloud)$"
|
||||||
"float,class:Keybase"
|
"float,class:^(Keybase)$"
|
||||||
"float,class:org.kde.kwalletmanager5"
|
"float,class:^(org.kde.kwalletmanager5)$"
|
||||||
"float,class:org.keepassxc.KeePassXC"
|
"float,class:^(org.keepassxc.KeePassXC)$"
|
||||||
"float,class:Typora"
|
"float,class:^(Typora)$"
|
||||||
"workspace special:magic, class:^my-app-class$"
|
"workspace special:magic, class:^(my-app-class)$"
|
||||||
];
|
];
|
||||||
|
|
||||||
input.numlock_by_default = true;
|
input.numlock_by_default = true;
|
||||||
|
|||||||
@ -1,4 +1,26 @@
|
|||||||
{
|
{
|
||||||
|
"cava": {
|
||||||
|
"framerate": 30,
|
||||||
|
"autosens": 1,
|
||||||
|
"sensitivity": 100,
|
||||||
|
"bars": 14,
|
||||||
|
"lower_cutoff_freq": 50,
|
||||||
|
"higher_cutoff_freq": 10000,
|
||||||
|
"method": "pulse",
|
||||||
|
"source": "auto",
|
||||||
|
"stereo": true,
|
||||||
|
"reverse": false,
|
||||||
|
"bar_delimiter": 0,
|
||||||
|
"monstercat": false,
|
||||||
|
"waves": false,
|
||||||
|
"noise_reduction": 0.77,
|
||||||
|
"input_delay": 2,
|
||||||
|
"format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
|
||||||
|
"actions": {
|
||||||
|
"on-click-right": "mode"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
"clock": {
|
"clock": {
|
||||||
"interval": 60,
|
"interval": 60,
|
||||||
"timezone": "America/Los_Angeles",
|
"timezone": "America/Los_Angeles",
|
||||||
@ -38,6 +60,13 @@
|
|||||||
"tooltip-format": "Available {free} of {total}",
|
"tooltip-format": "Available {free} of {total}",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"jack": {
|
||||||
|
"format": "DSP {}%",
|
||||||
|
"format-xrun": "{xruns} xruns",
|
||||||
|
"format-disconnected": "DSP off",
|
||||||
|
"realtime": true
|
||||||
|
},
|
||||||
|
|
||||||
"memory": {
|
"memory": {
|
||||||
"interval": 10,
|
"interval": 10,
|
||||||
"format": " {percentage}%",
|
"format": " {percentage}%",
|
||||||
@ -61,6 +90,48 @@
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"pulseaudio": {
|
||||||
|
"format": "{volume}% {icon}",
|
||||||
|
"format-bluetooth": "{volume}% {icon}",
|
||||||
|
"format-muted": "",
|
||||||
|
"format-icons": {
|
||||||
|
"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
|
||||||
|
"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
|
||||||
|
"headphone": "",
|
||||||
|
"hands-free": "",
|
||||||
|
"headset": "",
|
||||||
|
"phone": "",
|
||||||
|
"phone-muted": "",
|
||||||
|
"portable": "",
|
||||||
|
"car": "",
|
||||||
|
"default": ["", ""]
|
||||||
|
},
|
||||||
|
"scroll-step": 1,
|
||||||
|
"on-click": "pavucontrol",
|
||||||
|
"ignored-sinks": ["Easy Effects Sink"]
|
||||||
|
},
|
||||||
|
|
||||||
|
"pulseaudio/slider": {
|
||||||
|
"min": 0,
|
||||||
|
"max": 100,
|
||||||
|
"orientation": "horizontal"
|
||||||
|
},
|
||||||
|
|
||||||
|
"systemd-failed-units": {
|
||||||
|
"hide-on-ok": false, // Do not hide if there is zero failed units.
|
||||||
|
"format": "✗ {nr_failed}",
|
||||||
|
"format-ok": "✓",
|
||||||
|
"system": true, // Monitor failed systemwide units.
|
||||||
|
"user": false, // Ignore failed user units.
|
||||||
|
},
|
||||||
|
|
||||||
|
"wireplumber": {
|
||||||
|
"format": "{volume}% {icon}",
|
||||||
|
"format-muted": "",
|
||||||
|
"on-click": "helvum",
|
||||||
|
"format-icons": ["", "", ""]
|
||||||
|
},
|
||||||
|
|
||||||
"wlr/taskbar": {
|
"wlr/taskbar": {
|
||||||
"format": "{icon}",
|
"format": "{icon}",
|
||||||
"icon-size": 28,
|
"icon-size": 28,
|
||||||
@ -124,10 +195,12 @@
|
|||||||
"12": "XII",
|
"12": "XII",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
"tray": {
|
"tray": {
|
||||||
"icon-size": 31,
|
"icon-size": 31,
|
||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
},
|
||||||
|
|
||||||
"custom/polycat": {
|
"custom/polycat": {
|
||||||
"exec": "/home/wayne/bin/polycat.sh",
|
"exec": "/home/wayne/bin/polycat.sh",
|
||||||
"interval": 2,
|
"interval": 2,
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
include = "~/system/pkgs/wm/waybar/default.json";
|
include = "~/system/pkgs/wm/waybar/default.json";
|
||||||
modules-left = [ "custom/os_button" "hyprland/workspaces#roman" ];
|
modules-left = [ "custom/os_button" "hyprland/workspaces#roman" ];
|
||||||
modules-center = [ "hyprland/window" "wlr/taskbar" ]; # replace wlr/taskbar
|
modules-center = [ "hyprland/window" "wlr/taskbar" ]; # replace wlr/taskbar
|
||||||
modules-right = [ "cpu" "temperature" "disk" "tray" "clock" "custom/exit" ];
|
modules-right = [ "pulseaudio/slider" "cpu" "temperature" "disk" "tray" "clock" "custom/exit" ];
|
||||||
|
|
||||||
"custom/os_button" = {
|
"custom/os_button" = {
|
||||||
"format" = "";
|
"format" = "";
|
||||||
@ -48,7 +48,7 @@
|
|||||||
height = 47;
|
height = 47;
|
||||||
output = "DP-6";
|
output = "DP-6";
|
||||||
include = "~/system/pkgs/wm/waybar/default.json";
|
include = "~/system/pkgs/wm/waybar/default.json";
|
||||||
modules-left = [ ];
|
modules-left = [ "systemd-failed-units" "jack" ];
|
||||||
modules-center = [ "wlr/taskbar" ];
|
modules-center = [ "wlr/taskbar" ];
|
||||||
modules-right = [ "hyprland/workspaces#roman" "network" ];
|
modules-right = [ "hyprland/workspaces#roman" "network" ];
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user