update
This commit is contained in:
parent
b81610cd8b
commit
b663dea6ed
24
flake.lock
24
flake.lock
|
@ -76,11 +76,11 @@
|
|||
"mesa-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1662506186,
|
||||
"narHash": "sha256-KcNOapj/UuaYVnq3T40TP+jCkokgg2NTLN62dbb8JKQ=",
|
||||
"lastModified": 1662758755,
|
||||
"narHash": "sha256-dOlQAySir0NB3VXCngV/vfNNTqG0ftI8EZ8t0nEhf40=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6e020dff99e5f3fd6e059d158c46e16dc69ecc3e",
|
||||
"revCount": 159361,
|
||||
"rev": "e6cdffa0fcba7289ce2b51f783318a913c80eb91",
|
||||
"revCount": 159470,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.freedesktop.org/mesa/mesa.git"
|
||||
},
|
||||
|
@ -184,11 +184,11 @@
|
|||
"wlroots-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1662384859,
|
||||
"narHash": "sha256-oEyanqgkpIAXmv2oTyT6FNv/mb9PrU5mf/0CgnU07Oo=",
|
||||
"lastModified": 1662639520,
|
||||
"narHash": "sha256-1fft+tP0iAi5eCmWsoOQlpNepmMdSrEMog+rMQ3trXo=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "f8ae56490664e716ea1ad701172c7aaa39e9a5ab",
|
||||
"revCount": 5688,
|
||||
"rev": "4cc5bdc4d1c23177532d9d075bd9896b7fe4b5a6",
|
||||
"revCount": 5696,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.freedesktop.org/wlroots/wlroots.git"
|
||||
},
|
||||
|
@ -200,11 +200,11 @@
|
|||
"xorg-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1661927934,
|
||||
"narHash": "sha256-SRV2DeWFWO8SmBLOfqmPQasnYLXwwZYZRiuduE72bwY=",
|
||||
"lastModified": 1662742363,
|
||||
"narHash": "sha256-YJuBvWRs9tiKvNRuuKLegElhxLpbLZz39YZptg9+qUA=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "79c572fbd349cb6373f685a502e430552f856995",
|
||||
"revCount": 17898,
|
||||
"rev": "2ab70dede76c99876d7d5d1efa521b8082e13210",
|
||||
"revCount": 17909,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.freedesktop.org/xorg/xserver.git"
|
||||
},
|
||||
|
|
29
flake.nix
29
flake.nix
|
@ -11,7 +11,6 @@
|
|||
|
||||
nur = {
|
||||
url = "github:nix-community/NUR";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Kakoune Plugins
|
||||
|
@ -25,11 +24,6 @@
|
|||
flake = false;
|
||||
};
|
||||
|
||||
xorg-git = {
|
||||
url = "git+https://gitlab.freedesktop.org/xorg/xserver.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# Kakoune Plugins End
|
||||
|
||||
rofi-theme = {
|
||||
|
@ -47,7 +41,20 @@
|
|||
flake = false;
|
||||
};
|
||||
|
||||
grub2-themes.url = "github:vinceliuice/grub2-themes";
|
||||
xorg-git = {
|
||||
url = "git+https://gitlab.freedesktop.org/xorg/xserver.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
mesa-git = {
|
||||
url = "git+https://gitlab.freedesktop.org/mesa/mesa.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
grub2-themes = {
|
||||
url = "github:vinceliuice/grub2-themes";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
@ -69,6 +76,7 @@
|
|||
in
|
||||
{
|
||||
overlays.default = (final: prev: rec {
|
||||
|
||||
nerdfonts = prev.nerdfonts.override {
|
||||
fonts = [
|
||||
"JetBrainsMono"
|
||||
|
@ -109,6 +117,13 @@
|
|||
inherit pkgs;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
{
|
||||
#needed to get tools working that expect a nixpkgs channel to exist
|
||||
nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
|
||||
nix.registry = {
|
||||
nixpkgs.flake = nixpkgs;
|
||||
};
|
||||
}
|
||||
./system/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
grub = {
|
||||
enable = true;
|
||||
useOSProber = true;
|
||||
useOSProber = false;
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
};
|
||||
|
@ -43,8 +43,9 @@
|
|||
};
|
||||
|
||||
initrd.availableKernelModules = [ "amdgpu" ];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
kernelModules = [ "i2c-dev" "i2c-piix4" ];
|
||||
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
@ -103,7 +104,6 @@
|
|||
locate = pkgs.plocate;
|
||||
localuser = null;
|
||||
prunePaths = lib.mkOptionDefault [
|
||||
"/mnt/btrfs"
|
||||
];
|
||||
interval = "hourly";
|
||||
};
|
||||
|
@ -128,6 +128,7 @@
|
|||
|
||||
programs.fish.enable = true;
|
||||
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.manuel = {
|
||||
isNormalUser = true;
|
||||
|
@ -153,19 +154,13 @@
|
|||
binsh = "${pkgs.dash}/bin/dash";
|
||||
};
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# List services that you want to enable:
|
||||
services.udev.packages = [ pkgs.openrgb ];
|
||||
|
||||
programs.dconf.enable = true;
|
||||
|
||||
programs.kdeconnect.enable = true;
|
||||
|
||||
services.geoclue2 = {
|
||||
enable = true;
|
||||
appConfig."gammastep".isAllowed = true;
|
||||
|
@ -207,6 +202,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
||||
nix.gc = {
|
||||
persistent = true;
|
||||
automatic = true;
|
||||
|
|
|
@ -16,28 +16,20 @@
|
|||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nixos-root" "compress-force=zstd" ];
|
||||
device = "/dev/disk/by-uuid/5907e244-fda6-41d4-aff1-a2be7160a559";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot/efi" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/1AC9-E1AD";
|
||||
device = "/dev/disk/by-uuid/D56E-61DC";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/mnt/btrfs" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/" ];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/hdd" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/beccaf7e-9c7e-4c04-959b-52f1e0375491";
|
||||
fsType = "ext4";
|
||||
device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
|
@ -46,15 +38,8 @@
|
|||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/opt/games" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@steamgames" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/b7ec8c05-2a36-4b35-99fc-866e97c6330b"; }];
|
||||
[{ device = "/dev/disk/by-uuid/e0d93baa-8a8f-4fb2-9a48-f37f5d397826"; }];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
{ config, pkgs, ... }: {
|
||||
programs.dircolors = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -49,6 +49,7 @@
|
|||
};
|
||||
shellAliases = {
|
||||
nf = "${pkgs.neofetch}/bin/neofetch";
|
||||
r = "${pkgs.nnn}/bin/nnn";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
{ configs, pkgs, ... }: {
|
||||
|
||||
programs.nnn = {
|
||||
enable = true;
|
||||
package = pkgs.nnn.override ({ withNerdIcons = true; });
|
||||
};
|
||||
}
|
||||
|
|
@ -76,9 +76,9 @@ in
|
|||
"Mod5+F12" = "exec ${pkgs.mpc-cli}/bin/mpc next";
|
||||
"XF86AudioMute" = "exec mpc toggle";
|
||||
|
||||
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy screen";
|
||||
"${modifier}+Shift+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy area";
|
||||
"${modifier}+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy active";
|
||||
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot -c --notify copy screen";
|
||||
"${modifier}+Shift+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot -c --notify copy area";
|
||||
"${modifier}+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot -c --notify copy active";
|
||||
|
||||
"${modifier}+d" = "exec ${pkgs.rofi-wayland}/bin/rofi -show drun";
|
||||
"${modifier}+Shift+p" = "exec ${passmenu}/bin/passmenu.sh";
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
./configs/mpd/mpd.nix
|
||||
./configs/mpv/mpv.nix
|
||||
./configs/firefox/firefox.nix
|
||||
./configs/nnn/nnn.nix
|
||||
./configs/dircolors.nix
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the
|
||||
|
@ -32,6 +34,7 @@
|
|||
pkgs.thunderbird
|
||||
pkgs.twemoji-color-font
|
||||
pkgs.xivlauncher
|
||||
pkgs.sxiv
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
|
@ -112,6 +115,7 @@
|
|||
enable = true;
|
||||
defaultApplications = {
|
||||
"inode/directory" = [ "thunar.desktop" ];
|
||||
"text/html" = [ "firefox.desktop" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue