feat: changes to kanshi nvidia hyprland
Bumped flake inputs to latest
This commit is contained in:
parent
466f0992f1
commit
09e506c6a6
14 changed files with 252 additions and 128 deletions
|
@ -15,6 +15,7 @@
|
|||
displayScale = mkOption {type = int;};
|
||||
myAutostartCommands = mkOption {type = listOf str;};
|
||||
myConfigLocation = mkOption {type = str;};
|
||||
desktopFontFullName = mkOption {type = str;};
|
||||
};
|
||||
|
||||
# Default values for this configuration
|
||||
|
@ -30,6 +31,12 @@
|
|||
"${pkgs.udiskie}/bin/udiskie"
|
||||
"${pkgs.pa-notify}/bin/pa-notify"
|
||||
];
|
||||
specialisation."powersave".configuration = {
|
||||
myAutostartCommands = [
|
||||
"${pkgs.brightnessctl}/bin/brightnessctl s 64"
|
||||
];
|
||||
};
|
||||
myConfigLocation = "/home/${myUserName}/nix-conf";
|
||||
desktopFontFullName = "BlexMono Nerd Font";
|
||||
};
|
||||
}
|
||||
|
|
168
flake.lock
generated
168
flake.lock
generated
|
@ -189,11 +189,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1726153070,
|
||||
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -221,6 +221,24 @@
|
|||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"stylix",
|
||||
|
@ -241,6 +259,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakey-profile": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -274,11 +307,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724440431,
|
||||
"narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
|
||||
"lastModified": 1725513492,
|
||||
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
|
||||
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -333,11 +366,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724435763,
|
||||
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||
"lastModified": 1726440980,
|
||||
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -354,11 +387,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724435763,
|
||||
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||
"lastModified": 1726357542,
|
||||
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -375,11 +408,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715930644,
|
||||
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
|
||||
"lastModified": 1724435763,
|
||||
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
|
||||
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -388,6 +421,41 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723503926,
|
||||
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
|
||||
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723510904,
|
||||
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
|
||||
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -396,11 +464,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724469941,
|
||||
"narHash": "sha256-+U5152FwmDD9EUOiFi5CFxCK6/yFESyDei9jEIlmUtI=",
|
||||
"lastModified": 1726188813,
|
||||
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "ea319a737939094b48fda9063fa3201ef2479aac",
|
||||
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -411,11 +479,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1724224976,
|
||||
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
|
||||
"lastModified": 1726243404,
|
||||
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
|
||||
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -427,11 +495,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1714912032,
|
||||
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
|
||||
"lastModified": 1725194671,
|
||||
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
|
||||
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -456,11 +524,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724528976,
|
||||
"narHash": "sha256-5W13nD/5ySIsxSvDqXHlj4bg2F3tNcYGKCGudWzpNzw=",
|
||||
"lastModified": 1726502324,
|
||||
"narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "8234ee85eaa2c8b7f2c74f5b4cdf02c4965b07fc",
|
||||
"rev": "2e3083e42509c399b224239f6d7fa17976b18536",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -471,18 +539,18 @@
|
|||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723969429,
|
||||
"narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=",
|
||||
"lastModified": 1726392886,
|
||||
"narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0",
|
||||
"rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -494,6 +562,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"lix-module": "lix-module",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
|
@ -508,11 +577,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724472954,
|
||||
"narHash": "sha256-65NfzEvwdJGHsOZA+w4AUFUG10RyfuQltct3h++gsw0=",
|
||||
"lastModified": 1726460241,
|
||||
"narHash": "sha256-wslbKgh6ZEqHzZJj1eHGRENZQ4r1C4LmAvaBKvbiGzg=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "3caf2a241f7af52419ce97c6682b0467219ab914",
|
||||
"rev": "fe1722602352cba0448f3961df90b5d1f55d5675",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -531,18 +600,18 @@
|
|||
"base16-tmux": "base16-tmux",
|
||||
"base16-vim": "base16-vim",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems_2"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724444244,
|
||||
"narHash": "sha256-fH1lyJvJjUhZ8xMlmiI18EZNzodDSe74rFuwlZDL0aQ=",
|
||||
"lastModified": 1726497442,
|
||||
"narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "d042af478ce87e188139480922a3085218194106",
|
||||
"rev": "149b313ddf91c3cc94309170498b162cec666675",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -581,6 +650,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -589,11 +673,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724338379,
|
||||
"narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
|
||||
"lastModified": 1725271838,
|
||||
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
|
||||
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
13
flake.nix
13
flake.nix
|
@ -11,7 +11,10 @@
|
|||
# Home manager
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stylix.url = "github:danth/stylix";
|
||||
spicetify-nix = {
|
||||
url = "github:Gerg-L/spicetify-nix";
|
||||
|
@ -25,6 +28,7 @@
|
|||
home-manager,
|
||||
stylix,
|
||||
spicetify-nix,
|
||||
lix-module,
|
||||
...
|
||||
} @ inputs: let
|
||||
inherit (self) outputs;
|
||||
|
@ -36,9 +40,7 @@
|
|||
nixosConfigurations = {
|
||||
"${myHostName}" = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs outputs;};
|
||||
modules = [
|
||||
./nixos/configuration.nix
|
||||
];
|
||||
modules = [./nixos/configuration.nix lix-module.nixosModules.default];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -46,7 +48,8 @@
|
|||
# Available through 'home-manager --flake .#your-username@your-hostname'
|
||||
homeConfigurations = {
|
||||
"${stevenUserName}@${myHostName}" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
|
||||
pkgs =
|
||||
nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
|
||||
extraSpecialArgs = {inherit inputs outputs;};
|
||||
modules = [
|
||||
./home-manager/${stevenUserName}/home.nix
|
||||
|
|
|
@ -9,7 +9,10 @@
|
|||
source = ./config;
|
||||
};
|
||||
};
|
||||
home.packages = with pkgs; [ags];
|
||||
home.packages = with pkgs; [
|
||||
ags
|
||||
brightnessctl
|
||||
];
|
||||
myAutostartCommands = [
|
||||
#"${pkgs.ags}/bin/ags --init"
|
||||
"${pkgs.ags}/bin/ags"
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
zed-editor
|
||||
rhythmbox
|
||||
#clash-verge-rev
|
||||
vesktop
|
||||
qq
|
||||
libreoffice
|
||||
discord
|
||||
|
|
|
@ -19,10 +19,11 @@
|
|||
xwayland = {force_zero_scaling = true;};
|
||||
monitor = [
|
||||
#"eDP-1, 1920x1080@165,0x0,1"
|
||||
",preferred, auto, ${builtins.toString config.displayScale}"
|
||||
"HDMI-A-1, 1920x1080@75, 2560x0, 1"
|
||||
"eDP-1,preferred, auto, ${builtins.toString config.displayScale}"
|
||||
];
|
||||
general = {
|
||||
border_size = 3;
|
||||
border_size = 1;
|
||||
gaps_in = 2.5;
|
||||
gaps_out = 5;
|
||||
};
|
||||
|
@ -39,7 +40,7 @@
|
|||
exec-once =
|
||||
config.myAutostartCommands
|
||||
++ [
|
||||
"[workspace special silent] ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}"
|
||||
"[workspace special silent] ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=16' -o colors.alpha=0.85 ${config.myShells.defaultShell}"
|
||||
];
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
|
@ -55,11 +56,11 @@
|
|||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
];
|
||||
bind = let
|
||||
terminalCmd = "${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}";
|
||||
terminalCmd = "${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=16' -o colors.alpha=0.85 ${config.myShells.defaultShell}";
|
||||
screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png";
|
||||
in
|
||||
[
|
||||
"$mod SHIFT, L, exec, ${pkgs.hyprlock}/bin/hyprlock --immediate"
|
||||
"$mod SHIFT, L, exec, ${pkgs.wlogout}/bin/wlogout"
|
||||
|
||||
"$mod SHIFT, Print, exec, ${pkgs.grimblast}/bin/grimblast copysave output ${screenshotLocation}"
|
||||
", Print, exec, ${pkgs.grimblast}/bin/grimblast copysave area ${screenshotLocation}"
|
||||
|
|
|
@ -33,13 +33,8 @@
|
|||
outputs = [
|
||||
{
|
||||
criteria = "HDMI-A-1";
|
||||
position = "0,0";
|
||||
mode = "1920x1080@60.00Hz";
|
||||
}
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
position = "0,0";
|
||||
status = "disable";
|
||||
position = "2560,0";
|
||||
mode = "1920x1080@75.00Hz";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
{pkgs}: {
|
||||
cd = "z";
|
||||
cdi = "zi";
|
||||
ls = "${pkgs.eza}/bin/exa";
|
||||
ls = "${pkgs.lsd}/bin/lsd";
|
||||
cat = "${pkgs.bat}/bin/bat";
|
||||
ll = "ls -l";
|
||||
rm = "${pkgs.trash-cli}/bin/trash";
|
||||
osupdate = "${pkgs.nh}/bin/nh os switch";
|
||||
homeupdate = "${pkgs.nh}/bin/nh home switch";
|
||||
batmon = "watch -n0 upower -i /org/freedesktop/UPower/devices/battery_BAT1";
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
config = rec {
|
||||
modifier = "Mod4";
|
||||
terminal = "${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=24' zsh";
|
||||
terminal = "${pkgs.foot}/bin/foot -f '${config.desktopFontFullName}:size=24' zsh";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
90
nixos/bootloader.nix
Normal file
90
nixos/bootloader.nix
Normal file
|
@ -0,0 +1,90 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
distro-grub-themes = pkgs.stdenv.mkDerivation {
|
||||
pname = "distro-grub-themes";
|
||||
version = "3.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "AdisonCavani";
|
||||
repo = "distro-grub-themes";
|
||||
rev = "v3.1";
|
||||
hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs=";
|
||||
};
|
||||
installPhase = "cp -r customize/nixos $out";
|
||||
};
|
||||
xenlism-grub-themes = pkgs.stdenv.mkDerivation {
|
||||
pname = "xenlism-grub-themes";
|
||||
version = "1.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "xenlism";
|
||||
repo = "Grub-themes";
|
||||
rev = "40ac048df9aacfc053c515b97fcd24af1a06762f";
|
||||
hash = "sha256-ProTKsFocIxWAFbYgQ46A+GVZ7mUHXxZrvdiPJqZJ6I=";
|
||||
};
|
||||
installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out";
|
||||
};
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [hack-font];
|
||||
#fileSystems."/mnt/winsys" = {
|
||||
# device = "/dev/nvme0n1p5";
|
||||
# fsType = "ntfs-3g";
|
||||
# options = [ "rw" "uid=1000" ];
|
||||
#};
|
||||
#fileSystems."/mnt/windata" = {
|
||||
# device = "/dev/nvme0n1p3";
|
||||
# fsType = "ntfs-3g";
|
||||
# options = [ "rw" "uid=1000" ];
|
||||
#};
|
||||
boot = {
|
||||
plymouth = {
|
||||
enable = true;
|
||||
theme = "rings";
|
||||
themePackages = with pkgs; [
|
||||
# By default we would install all themes
|
||||
(adi1090x-plymouth-themes.override {selected_themes = ["rings"];})
|
||||
];
|
||||
};
|
||||
|
||||
# Enable "Silent Boot"
|
||||
consoleLogLevel = 0;
|
||||
initrd.verbose = false;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"boot.shell_on_fail"
|
||||
"loglevel=3"
|
||||
"rd.systemd.show_status=false"
|
||||
"rd.udev.log_level=3"
|
||||
"udev.log_priority=3"
|
||||
];
|
||||
# Hide the OS choice for bootloaders.
|
||||
# It's still possible to open the bootloader list by pressing any key
|
||||
# It will just not appear on screen unless a key is pressed
|
||||
supportedFilesystems = ["ntfs"];
|
||||
loader = {
|
||||
#timeout = 0;
|
||||
efi = {canTouchEfiVariables = true;};
|
||||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
fsIdentifier = "label";
|
||||
devices = ["nodev"];
|
||||
extraEntries = ''
|
||||
menuentry "Reboot" {
|
||||
reboot
|
||||
}
|
||||
menuentry "Poweroff" {
|
||||
halt
|
||||
}
|
||||
'';
|
||||
useOSProber = true;
|
||||
configurationLimit = 10;
|
||||
fontSize = 32;
|
||||
theme = xenlism-grub-themes;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -10,7 +10,7 @@
|
|||
imports = [
|
||||
../common/variables.nix
|
||||
./greetd.nix
|
||||
./grub.nix
|
||||
./bootloader.nix
|
||||
./nvidia.nix
|
||||
./fonts.nix
|
||||
./services/laptop.preset.nix
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
liberation_ttf
|
||||
mplus-outline-fonts.githubRelease
|
||||
dina-font
|
||||
|
||||
#proggyfonts
|
||||
#glasstty-ttf
|
||||
(
|
||||
|
@ -22,6 +23,7 @@
|
|||
"CascadiaMono"
|
||||
"CommitMono"
|
||||
"JetBrainsMono"
|
||||
"ProggyClean"
|
||||
];
|
||||
}
|
||||
)
|
||||
|
|
|
@ -1,64 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
distro-grub-themes = pkgs.stdenv.mkDerivation {
|
||||
pname = "distro-grub-themes";
|
||||
version = "3.1";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "AdisonCavani";
|
||||
repo = "distro-grub-themes";
|
||||
rev = "v3.1";
|
||||
hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs=";
|
||||
};
|
||||
installPhase = "cp -r customize/nixos $out";
|
||||
};
|
||||
xenlism-grub-themes = pkgs.stdenv.mkDerivation {
|
||||
pname = "xenlism-grub-themes";
|
||||
version = "1.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "xenlism";
|
||||
repo = "Grub-themes";
|
||||
rev = "40ac048df9aacfc053c515b97fcd24af1a06762f";
|
||||
hash = "sha256-ProTKsFocIxWAFbYgQ46A+GVZ7mUHXxZrvdiPJqZJ6I=";
|
||||
};
|
||||
installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out";
|
||||
};
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [hack-font];
|
||||
boot.supportedFilesystems = ["ntfs"];
|
||||
#fileSystems."/mnt/winsys" = {
|
||||
# device = "/dev/nvme0n1p5";
|
||||
# fsType = "ntfs-3g";
|
||||
# options = [ "rw" "uid=1000" ];
|
||||
#};
|
||||
#fileSystems."/mnt/windata" = {
|
||||
# device = "/dev/nvme0n1p3";
|
||||
# fsType = "ntfs-3g";
|
||||
# options = [ "rw" "uid=1000" ];
|
||||
#};
|
||||
boot.loader = {
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
};
|
||||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
fsIdentifier = "label";
|
||||
devices = ["nodev"];
|
||||
extraEntries = ''
|
||||
menuentry "Reboot" {
|
||||
reboot
|
||||
}
|
||||
menuentry "Poweroff" {
|
||||
halt
|
||||
}
|
||||
'';
|
||||
useOSProber = true;
|
||||
configurationLimit = 10;
|
||||
theme = xenlism-grub-themes;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -34,7 +34,7 @@
|
|||
};
|
||||
forceFullCompositionPipeline = true;
|
||||
modesetting.enable = true;
|
||||
# open = true;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue