[Flake] Move to 26.05
This commit is contained in:
16
flake.lock
generated
16
flake.lock
generated
@@ -7,32 +7,32 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779506708,
|
"lastModified": 1779726825,
|
||||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
"narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
"rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.11",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779102034,
|
"lastModified": 1779971959,
|
||||||
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
|
"narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
|
"rev": "ec942ba042dad5ef097e2ef3a3effc034241f011",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
description = "System Configuration";
|
description = "System Configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-26.05";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager?ref=release-25.11";
|
url = "github:nix-community/home-manager?ref=release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
vtsls # Language Server
|
vtsls # Language Server
|
||||||
eslint # Linter
|
eslint # Linter
|
||||||
nodePackages.prettier # Formatter
|
prettier # Formatter
|
||||||
tailwindcss-language-server # Language server for tailwind CSS
|
tailwindcss-language-server # Language server for tailwind CSS
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
programs.eww = {
|
programs.eww = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configDir = ./config;
|
yuckConfig = "${./config}";
|
||||||
|
scssConfig = "${./config}";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,11 +18,16 @@
|
|||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
# TODO: Switch to the newer LUA config?
|
||||||
|
configType = "hyprlang";
|
||||||
|
|
||||||
plugins = [
|
plugins = [
|
||||||
# https://github.com/outfoxxed/hy3
|
# https://github.com/outfoxxed/hy3
|
||||||
pkgs.hyprlandPlugins.hy3
|
pkgs.hyprlandPlugins.hy3
|
||||||
# https://github.com/shezdy/hyprsplit
|
# https://github.com/shezdy/hyprsplit
|
||||||
pkgs.hyprlandPlugins.hyprsplit
|
# TODO: Fails to build
|
||||||
|
# pkgs.hyprlandPlugins.hyprsplit
|
||||||
];
|
];
|
||||||
|
|
||||||
# Disable systemd because it conflicts with UWSM
|
# Disable systemd because it conflicts with UWSM
|
||||||
|
|||||||
@@ -71,8 +71,12 @@ in
|
|||||||
gtk3.extraConfig = {
|
gtk3.extraConfig = {
|
||||||
gtk-application-prefer-dark-theme = true;
|
gtk-application-prefer-dark-theme = true;
|
||||||
};
|
};
|
||||||
gtk4.extraConfig = {
|
gtk4 = {
|
||||||
gtk-application-prefer-dark-theme = true;
|
# Don't use GTK4 themes. See https://stopthemingmy.app/
|
||||||
|
theme = null;
|
||||||
|
extraConfig = {
|
||||||
|
gtk-application-prefer-dark-theme = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
withNodeJs = true;
|
withNodeJs = true;
|
||||||
|
withRuby = false; # New default as of 26.05, needs explicit change since original config is old.
|
||||||
|
withPython3 = false; # New default as of 26.05, needs explicit change since original config is old.
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
gcc # For treesitter complation
|
gcc # For treesitter complation
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
# System
|
# System
|
||||||
htop
|
htop
|
||||||
btop
|
btop
|
||||||
neofetch
|
|
||||||
psmisc # fuser, killal, pstree
|
psmisc # fuser, killal, pstree
|
||||||
|
|
||||||
# Archives
|
# Archives
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
programs.adb.enable = true;
|
|
||||||
users.users.drew.extraGroups = [ "adbusers" ];
|
users.users.drew.extraGroups = [ "adbusers" ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
};
|
};
|
||||||
services.displayManager.gdm = {
|
services.displayManager.gdm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wayland = true;
|
|
||||||
};
|
};
|
||||||
# services.displayManager.ly.enable = true;
|
# services.displayManager.ly.enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,8 @@
|
|||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
# Disable wpa-supplicant to avoid conflicts with network manager.
|
# Disable wpa-supplicant to avoid conflicts with network manager.
|
||||||
networking.wireless.enable = false;
|
# Appears this is not needed as of 26.05
|
||||||
|
# networking.wireless.enable = false;
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "America/Los_Angeles";
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|||||||
Reference in New Issue
Block a user