Compare commits
3 Commits
8fd9d95f00
...
acd6498875
| Author | SHA1 | Date | |
|---|---|---|---|
| acd6498875 | |||
| 0dd59cb0ec | |||
| 1caf83fc3e |
16
flake.lock
generated
16
flake.lock
generated
@@ -30,8 +30,8 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774431270,
|
"lastModified": 1774539899,
|
||||||
"narHash": "sha256-D1dtiU9K5LslHCnT1oEdChw1rddzVuIabOrqxeuNn/Y=",
|
"narHash": "sha256-LuIiEKPwQYQJF6u/vBLBpo5ZIXH0Isgpci5zWwlQns4=",
|
||||||
"path": "/home/love/dotfiles",
|
"path": "/home/love/dotfiles",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
@@ -47,11 +47,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774379316,
|
"lastModified": 1774550169,
|
||||||
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
|
"narHash": "sha256-cLcm8jXyhEDRHTCN1fym6+5L6Z264kj2QBpL+/yT3WI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
|
"rev": "7622882af88598b882436416bd74154826fcf742",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -82,11 +82,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774106199,
|
"lastModified": 1774386573,
|
||||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -27,13 +27,20 @@ in
|
|||||||
../../modules/base.nix
|
../../modules/base.nix
|
||||||
../../modules/zfs-root.nix
|
../../modules/zfs-root.nix
|
||||||
../../modules/desktop-hyprland.nix
|
../../modules/desktop-hyprland.nix
|
||||||
|
../../modules/bin-bash-wrapper.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
config.my.binBashWrapper.enable = true;
|
||||||
|
|
||||||
networking.hostName = hostName;
|
networking.hostName = hostName;
|
||||||
networking.hostId = "ff0b8826";
|
networking.hostId = "ff0b8826";
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
hardware.nvidia = {
|
hardware = {
|
||||||
|
graphics = {
|
||||||
|
enable32Bit = true;
|
||||||
|
};
|
||||||
|
nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
powerManagement.enable = false;
|
powerManagement.enable = false;
|
||||||
powerManagement.finegrained = false;
|
powerManagement.finegrained = false;
|
||||||
@@ -41,6 +48,9 @@ in
|
|||||||
nvidiaSettings = true;
|
nvidiaSettings = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
users.mutableUsers = true;
|
users.mutableUsers = true;
|
||||||
users.users.${userName} = {
|
users.users.${userName} = {
|
||||||
@@ -52,6 +62,8 @@ in
|
|||||||
"render"
|
"render"
|
||||||
"video"
|
"video"
|
||||||
"wheel"
|
"wheel"
|
||||||
|
"cdrom"
|
||||||
|
"docker"
|
||||||
];
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|||||||
25
modules/bin-bash-wrapper.nix
Normal file
25
modules/bin-bash-wrapper.nix
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.my.binBashWrapper;
|
||||||
|
|
||||||
|
bashWrapper = pkgs.writeShellScriptBin "bash" ''
|
||||||
|
exec /usr/bin/env bash "$@"
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
cfg = {
|
||||||
|
enable = lib.mkEnableOption "create a /bin/bash wrapper";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"L+ /bin/bash - - - - ${bashWrapper}/bin/bash"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
programs.hyprland.enable = true;
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
};
|
||||||
programs.thunar.enable = true;
|
programs.thunar.enable = true;
|
||||||
programs.thunderbird.enable = true;
|
programs.thunderbird.enable = true;
|
||||||
programs.xwayland.enable = true;
|
programs.xwayland.enable = true;
|
||||||
@@ -49,6 +52,9 @@
|
|||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-color-emoji
|
noto-fonts-color-emoji
|
||||||
|
vista-fonts
|
||||||
|
corefonts
|
||||||
|
source-han-sans
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.fontconfig.defaultFonts = {
|
fonts.fontconfig.defaultFonts = {
|
||||||
|
|||||||
Reference in New Issue
Block a user