shits fucked
This commit is contained in:
parent
9e68baee1c
commit
b3dd6afe04
17
flake.lock
17
flake.lock
|
@ -108,6 +108,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1698053470,
|
||||
"narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
|
||||
"owner": "NixOs",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOs",
|
||||
"ref": "master",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1697723726,
|
||||
|
@ -128,6 +144,7 @@
|
|||
"inputs": {
|
||||
"helix": "helix",
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
|
|
10
flake.nix
10
flake.nix
|
@ -11,6 +11,7 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOs/nixos-hardware/master";
|
||||
};
|
||||
|
||||
# pass in the urls defined above
|
||||
|
@ -20,6 +21,7 @@
|
|||
nixpkgs,
|
||||
home-manager,
|
||||
helix,
|
||||
nixos-hardware,
|
||||
...
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
|
@ -45,13 +47,12 @@
|
|||
specialArgs = {inherit inputs;};
|
||||
modules = [
|
||||
./hosts/JWST/configuration.nix
|
||||
nixos-hardware.nixosModules.dell-xps-15-9520
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia-disable
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users."tacocat".modules = [
|
||||
./users/tacocat/home.nix
|
||||
./users/tacocat/wayland
|
||||
];
|
||||
home-manager.users."tacocat" = ./users/tacocat/home.nix;
|
||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||
}
|
||||
];
|
||||
|
@ -63,7 +64,6 @@
|
|||
extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
|
||||
modules = [
|
||||
./users/tacocat/home.nix
|
||||
./users/tacocat/wayland
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
# efi.efiSysMountPoint = "/boot/efi";
|
||||
efi.efiSysMountPoint = "/boot/efi";
|
||||
grub = {
|
||||
efiSupport = true;
|
||||
configurationLimit = 10;
|
||||
|
@ -68,9 +68,9 @@
|
|||
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-compute-runtime
|
||||
];
|
||||
#extraPackages = with pkgs; [
|
||||
# intel-compute-runtime
|
||||
#];
|
||||
};
|
||||
|
||||
hardware.opentabletdriver.enable = true;
|
||||
|
@ -87,6 +87,7 @@
|
|||
};
|
||||
|
||||
programs.river.enable = true;
|
||||
programs.sway.enable = true;
|
||||
# programs.river.extraPackages = with pkgs; [
|
||||
# swaylock
|
||||
# swayidle
|
||||
|
|
|
@ -28,6 +28,11 @@
|
|||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot/efi" =
|
||||
{ device = "/dev/disk/by-uuid/F54B-C04F";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; }
|
||||
];
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
./shell
|
||||
./helix
|
||||
./emacs
|
||||
./wayland
|
||||
];
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
|
||||
|
||||
riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
|
||||
# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
|
||||
|
||||
riverctl map normal Super+Shift Return spawn 'kitty --single-instance'
|
||||
riverctl map normal Super D spawn 'rofi -show drun'
|
||||
|
@ -177,4 +177,4 @@ else
|
|||
fi
|
||||
|
||||
# autostart apps
|
||||
bash "$HOME/.config/river/process"
|
||||
# "$HOME/.config/river/process"
|
||||
|
|
Loading…
Reference in a new issue