Compare commits

...

4 commits

Author SHA1 Message Date
f7ffc5cdf9
merge 2024-04-30 06:41:29 +02:00
9a270a3e1f
flake.lock: Update
Flake lock file updates:

• Updated input 'cask-fonts':
    'github:homebrew/homebrew-cask-fonts/f7427131477742837a986c818cbf9ad8462e4a9f' (2024-04-14)
  → 'github:homebrew/homebrew-cask-fonts/5dbe07c7e101165698b5f60ffb0b72d438410e7e' (2024-04-22)
• Updated input 'darwin':
    'github:lnl7/nix-darwin/36524adc31566655f2f4d55ad6b875fb5c1a4083' (2024-03-30)
  → 'github:lnl7/nix-darwin/230a197063de9287128e2c68a7a4b0cd7d0b50a7' (2024-04-24)
• Updated input 'home-manager':
    'github:nix-community/home-manager/630a0992b3627c64e34f179fab68e3d48c6991c0' (2024-04-14)
  → 'github:nix-community/home-manager/2f072c127c041eec36621b8e38a531fe0fe07961' (2024-04-24)
• Updated input 'homebrew-cask':
    'github:homebrew/homebrew-cask/f54cd2763e4b6f5855175c45b11733ac9e75d4c9' (2024-04-14)
  → 'github:homebrew/homebrew-cask/8fb90cc5dd29e2003fa7a8be4cb9076da491e462' (2024-04-25)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/02ed287b5bfe4656a73e559991d258a3a321ea98' (2024-04-14)
  → 'github:homebrew/homebrew-core/eb13b8fe3930f7e917904087f51f3b5afab8b6de' (2024-04-25)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/5870244b592c22558b658dbaf94f9e41afb0316f' (2024-04-07)
  → 'github:hyprwm/contrib/110e6dc761d5c3d352574def3479a9c39dfc4358' (2024-04-22)
• Updated input 'unstable':
    'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10)
  → 'github:nixos/nixpkgs/572af610f6151fd41c212f897c71f7056e3fb518' (2024-04-23)
2024-04-25 09:06:34 +02:00
dcaebdb034
Merge branch 'main' of git.vatthauer.xyz:leonv/nixos 2024-04-25 09:06:15 +02:00
88bb64d98b
greetd 2024-04-18 06:53:04 +02:00
4 changed files with 20 additions and 40 deletions

View file

@ -19,6 +19,9 @@
}; };
}; };
# optimize power usage
powerManagement.enable = true;
# optimize storage # optimize storage
nix.optimise.automatic = true; nix.optimise.automatic = true;
@ -65,37 +68,6 @@
}; };
}; };
}; };
# services.greetd = {
# enable = true;
# package = pkgs.greetd.gtkgreet;
# settings = {
# default_session = {
# command = "Hyprland --config /etc/greetd/hyprland.conf";
# user = "greeter";
# };
# };
# };
# environment.etc."greetd/environments".text = ''
# Hyprland
# '';
# environment.etc."greetd/hyprland.conf".text = ''
# monitor = DP-3,2560x1440@144,1920x0,1
# monitor = HDMI-A-5,1920x1080@75,0x0,1
# misc {
# disable_hyprland_logo = true
# }
# exec-once = tuigreet -l -b /etc/greetd/wallpaper.jpg -s /etc/greetd/style.css; hyprctl dispatch exit
# '';
# environment.etc."greetd/wallpaper.jpg".source = ./hypr/wallpaper.jpg;
# environment.etc."greetd/style.css".text = ''
# window {
# background-position: center;
# background-repeat: no-repeat;
# background-size: cover;
# background-color: black;
# }
# '';
# Configure console keymap # Configure console keymap
console.keyMap = "us"; console.keyMap = "us";

View file

@ -8,10 +8,11 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "amdgpu" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "amdgpu" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.kernelParams = [ "video=DP-1:2560x1440@144" "video=HDMI-A-1:1920x1080@75" ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/2191540a-8cf9-400e-b4bc-9dbf71527b07"; { device = "/dev/disk/by-uuid/2191540a-8cf9-400e-b4bc-9dbf71527b07";

View file

@ -6,13 +6,13 @@
xwayland.enable = true; xwayland.enable = true;
settings = { settings = {
workspace = [ workspace = [
"1, monitor:HDMI-A-3, default:true, persistent:true" "1, monitor:HDMI-A-1, default:true, persistent:true"
"2, monitor:DP-3 , default:true, persistent:true" "2, monitor:DP-1 , default:true, persistent:true"
"special:scratchpad, on-created-empty:foot" "special:scratchpad, on-created-empty:foot"
]; ];
monitor = [ monitor = [
"DP-3 , 2560x1440@144, 1920x0, 1" "DP-1 , 2560x1440@144, 1920x0, 1"
"HDMI-A-5, 1920x1080@75 , 0x0 , 1" "HDMI-A-1, 1920x1080@75 , 0x0 , 1"
]; ];
input = { input = {
kb_layout = "de"; kb_layout = "de";
@ -84,10 +84,14 @@
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mod, 3, workspace, 3" "$mod, 3, workspace, 3"
"$mod, 4, workspace, 4" "$mod, 4, workspace, 4"
"$mod, 5, workspace, 5"
"$mod, 6, workspace, 6"
"$modd, 1, movetoworkspacesilent, 1" "$modd, 1, movetoworkspacesilent, 1"
"$modd, 2, movetoworkspacesilent, 2" "$modd, 2, movetoworkspacesilent, 2"
"$modd, 3, movetoworkspacesilent, 3" "$modd, 3, movetoworkspacesilent, 3"
"$modd, 4, movetoworkspacesilent, 4" "$modd, 4, movetoworkspacesilent, 4"
"$modd, 5, movetoworkspacesilent, 5"
"$modd, 6, movetoworkspacesilent, 6"
# fullscreen # fullscreen
"$mod, F11, fullscreen, 0" "$mod, F11, fullscreen, 0"

View file

@ -33,12 +33,15 @@
ripgrep ripgrep
fd fd
zoom-us zoom-us
obsidian
zotero
# development # development
jetbrains.idea-ultimate jetbrains.idea-ultimate
gnumake gnumake
texlive.combined.scheme-full texliveFull
ltex-ls # texlive.combined.scheme-full
# ltex-ls
ghostscript ghostscript
jdk11 jdk11
coq coq