Compare commits
8 Commits
e9eb8cc17a
...
a680781cc4
Author | SHA1 | Date |
---|---|---|
Nathan McCarty | a680781cc4 | |
Nathan McCarty | d902a12c56 | |
Nathan McCarty | 71adb46aab | |
Nathan McCarty | 0a17179443 | |
Nathan McCarty | aa126bb930 | |
Nathan McCarty | 6a7b831507 | |
Nathan McCarty | bbc3fd250b | |
Nathan McCarty | 5c045618d4 |
66
flake.lock
66
flake.lock
|
@ -176,8 +176,12 @@
|
||||||
},
|
},
|
||||||
"hyprland": {
|
"hyprland": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
"hyprland-protocols": [
|
||||||
"nixpkgs": "nixpkgs_2",
|
"hyprland-protocols"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"wlroots": "wlroots",
|
"wlroots": "wlroots",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
|
@ -197,7 +201,7 @@
|
||||||
},
|
},
|
||||||
"hyprland-contrib": {
|
"hyprland-contrib": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687033460,
|
"lastModified": 1687033460,
|
||||||
|
@ -216,7 +220,6 @@
|
||||||
"hyprland-protocols": {
|
"hyprland-protocols": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -480,22 +483,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1688500189,
|
|
||||||
"narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658161305,
|
"lastModified": 1658161305,
|
||||||
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
|
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
|
||||||
|
@ -511,7 +498,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688566749,
|
"lastModified": 1688566749,
|
||||||
"narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=",
|
"narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=",
|
||||||
|
@ -527,7 +514,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667292599,
|
"lastModified": 1667292599,
|
||||||
"narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
|
"narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
|
||||||
|
@ -543,7 +530,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667085676,
|
"lastModified": 1667085676,
|
||||||
"narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=",
|
"narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=",
|
||||||
|
@ -636,23 +623,25 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-contrib": "hyprland-contrib",
|
"hyprland-contrib": "hyprland-contrib",
|
||||||
|
"hyprland-protocols": "hyprland-protocols",
|
||||||
"idris2": "idris2",
|
"idris2": "idris2",
|
||||||
"java": "java",
|
"java": "java",
|
||||||
"nix-on-droid": "nix-on-droid",
|
"nix-on-droid": "nix-on-droid",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"quilt-server": "quilt-server",
|
"quilt-server": "quilt-server",
|
||||||
"scripts": "scripts",
|
"scripts": "scripts",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"wsl": "wsl"
|
"wsl": "wsl",
|
||||||
|
"xdph": "xdph_2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"swaywm-toggler": "swaywm-toggler"
|
"swaywm-toggler": "swaywm-toggler"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -694,7 +683,7 @@
|
||||||
"swaywm-toggler": {
|
"swaywm-toggler": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_5",
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667366374,
|
"lastModified": 1667366374,
|
||||||
|
@ -835,6 +824,29 @@
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"xdph_2": {
|
||||||
|
"inputs": {
|
||||||
|
"hyprland-protocols": [
|
||||||
|
"hyprland-protocols"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1685385764,
|
||||||
|
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
|
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
15
flake.nix
15
flake.nix
|
@ -9,7 +9,20 @@
|
||||||
url = "github:nix-community/home-manager/release-23.05";
|
url = "github:nix-community/home-manager/release-23.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland-protocols = {
|
||||||
|
url = "github:hyprwm/hyprland-protocols";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
hyprland = {
|
||||||
|
url = "github:hyprwm/Hyprland";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.hyprland-protocols.follows = "hyprland-protocols";
|
||||||
|
};
|
||||||
|
xdph = {
|
||||||
|
url = "github:hyprwm/xdg-desktop-portal-hyprland";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.hyprland-protocols.follows = "hyprland-protocols";
|
||||||
|
};
|
||||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||||
nix-on-droid = {
|
nix-on-droid = {
|
||||||
url = "github:t184256/nix-on-droid";
|
url = "github:t184256/nix-on-droid";
|
||||||
|
|
|
@ -6,12 +6,7 @@ let
|
||||||
shortcuts = inputs.self.packages.${pkgs.system}.shortcuts;
|
shortcuts = inputs.self.packages.${pkgs.system}.shortcuts;
|
||||||
in lib.mkMerge [
|
in lib.mkMerge [
|
||||||
# Hyprland specific configuration
|
# Hyprland specific configuration
|
||||||
(lib.mkIf hyprland {
|
(lib.mkIf hyprland { })
|
||||||
wayland.windowManager.hyprland.extraConfig = ''
|
|
||||||
env = QT_QPA_PLATFORMTHEME,qtct
|
|
||||||
env = QT_STYLE_OVERRIDE,kvantum
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
# General configuration
|
# General configuration
|
||||||
(lib.mkIf hyprland {
|
(lib.mkIf hyprland {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
{ config, lib, pkgs, inputs, ... }@args:
|
{ config, lib, pkgs, inputs, ... }@args:
|
||||||
let nathan = config.nathan;
|
let
|
||||||
|
nathan = config.nathan;
|
||||||
|
portal =
|
||||||
|
inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland.override {
|
||||||
|
hyprland-share-picker =
|
||||||
|
inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.hyprland-share-picker.override {
|
||||||
|
hyprland = config.wayland.windowManager.hyprland.package;
|
||||||
|
};
|
||||||
|
};
|
||||||
in with lib; {
|
in with lib; {
|
||||||
imports = [
|
imports = [
|
||||||
./desktop/waybar.nix
|
./desktop/waybar.nix
|
||||||
|
@ -34,12 +42,24 @@ in with lib; {
|
||||||
recommendedEnvironment = true;
|
recommendedEnvironment = true;
|
||||||
systemdIntegration = false;
|
systemdIntegration = false;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# Set environment variables to force wayland
|
# import home manager session variables
|
||||||
env = XCURSOR_SIZE,24
|
${lib.concatStringsSep "\n" (builtins.attrValues
|
||||||
# env = GDK_BACKEND,wayland,x11
|
(builtins.mapAttrs (name: value: "env = ${name},${value}")
|
||||||
# env = QT_QPA_PLATFORM,wayland;xcb
|
config.home.sessionVariables))}
|
||||||
# env = SDL_VIDEODRIVER,wayland
|
|
||||||
# env = CLUTTER_BACKEND,wayland
|
# Setup missing XDG variables
|
||||||
|
# env = XDG_SESSION_TYPE,wayland
|
||||||
|
# env = XDG_SESSION_DESKTOP,Hyprland
|
||||||
|
|
||||||
|
# Make applications respect wayland
|
||||||
|
env = GDK_BACKEND,wayland,x11
|
||||||
|
env = QT_QPA_PLATFORM,wayland;xcb
|
||||||
|
env = SDL_VIDEODRIVER,wayland
|
||||||
|
env = CLUTTER_BACKEND,wayland
|
||||||
|
|
||||||
|
# Make sure only the hyprland desktop portal is available
|
||||||
|
env = XDG_DESKTOP_PORTAL_DIR,${portal}/share/xdg-desktop-portal/portals
|
||||||
|
|
||||||
input {
|
input {
|
||||||
kb_layout = us
|
kb_layout = us
|
||||||
kb_variant =
|
kb_variant =
|
||||||
|
@ -183,8 +203,22 @@ in with lib; {
|
||||||
bindr = CAPS, caps_lock, exec, swayosd --caps-lock
|
bindr = CAPS, caps_lock, exec, swayosd --caps-lock
|
||||||
|
|
||||||
# systemd integration
|
# systemd integration
|
||||||
exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 2 && systemctl --user start hyprland-session.target
|
exec-once=dbus-update-activation-environment --systemd ${
|
||||||
|
lib.concatStringsSep " " ([
|
||||||
|
"DISPLAY"
|
||||||
|
"WAYLAND_DISPLAY"
|
||||||
|
"HYPRLAND_INSTANCE_SIGNATURE"
|
||||||
|
"XDG_CURRENT_DESKTOP"
|
||||||
|
"XDG_SESSION_TYPE"
|
||||||
|
"XDG_SESSION_DESKTOP"
|
||||||
|
"XDG_DESKTOP_PORTAL_DIR"
|
||||||
|
"XDG_BACKEND"
|
||||||
|
"GDK_BACKEND"
|
||||||
|
"QT_QPA_PLATFORM"
|
||||||
|
"SDL_VIDEODRIVER"
|
||||||
|
"CLUTTER_BACKEND"
|
||||||
|
] ++ builtins.attrNames config.home.sessionVariables)
|
||||||
|
} && sleep 2 && systemctl --user start hyprland-session.target
|
||||||
|
|
||||||
## Window rules
|
## Window rules
|
||||||
|
|
||||||
|
@ -234,6 +268,8 @@ in with lib; {
|
||||||
# Emacs streaming
|
# Emacs streaming
|
||||||
windowrulev2 = float,title:^(emacs-streaming)$
|
windowrulev2 = float,title:^(emacs-streaming)$
|
||||||
|
|
||||||
|
# Looking Glass
|
||||||
|
|
||||||
## Scratchpads
|
## Scratchpads
|
||||||
|
|
||||||
# Alacritty
|
# Alacritty
|
||||||
|
|
|
@ -98,6 +98,7 @@ in {
|
||||||
# ZFS
|
# ZFS
|
||||||
boot.supportedFilesystems = [ "zfs" ];
|
boot.supportedFilesystems = [ "zfs" ];
|
||||||
boot.zfs.forceImportRoot = false;
|
boot.zfs.forceImportRoot = false;
|
||||||
|
boot.zfs.extraPools = [ "bigssd" ];
|
||||||
# Generated with head -c4 /dev/urandom | od -A none -t x4
|
# Generated with head -c4 /dev/urandom | od -A none -t x4
|
||||||
networking.hostId = "bc94e9d3";
|
networking.hostId = "bc94e9d3";
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,4 +90,18 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Looking glass
|
||||||
|
xdg.configFile."looking-glass/client.ini" = {
|
||||||
|
text = ''
|
||||||
|
[input]
|
||||||
|
rawMouse=yes
|
||||||
|
[audio]
|
||||||
|
periodSize=512
|
||||||
|
bufferLatency=7
|
||||||
|
micDefault=allow
|
||||||
|
[egl]
|
||||||
|
scale = 1
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,15 @@ let
|
||||||
"10de:1ad9" # Usb ????
|
"10de:1ad9" # Usb ????
|
||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
|
##
|
||||||
|
## Packages
|
||||||
|
##
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Looking glass, avoids the need for another monitor
|
||||||
|
looking-glass-client
|
||||||
|
# For samba
|
||||||
|
cifs-utils
|
||||||
|
];
|
||||||
##
|
##
|
||||||
## Kernel configuration
|
## Kernel configuration
|
||||||
##
|
##
|
||||||
|
@ -25,7 +34,6 @@ in {
|
||||||
##
|
##
|
||||||
## Virtualization setup
|
## Virtualization setup
|
||||||
##
|
##
|
||||||
environment.systemPackages = with pkgs; [ looking-glass-client ];
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
virtualisation.spiceUSBRedirection.enable = true;
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
qemu = {
|
qemu = {
|
||||||
|
@ -55,4 +63,25 @@ in {
|
||||||
};
|
};
|
||||||
networking.defaultGateway = "10.0.4.1";
|
networking.defaultGateway = "10.0.4.1";
|
||||||
networking.nameservers = [ "10.0.0.10" ];
|
networking.nameservers = [ "10.0.0.10" ];
|
||||||
|
|
||||||
|
##
|
||||||
|
## Samba share
|
||||||
|
##
|
||||||
|
services.samba = {
|
||||||
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
|
extraConfig = ''
|
||||||
|
browseable = yes
|
||||||
|
smb encrypt = required
|
||||||
|
'';
|
||||||
|
shares = {
|
||||||
|
# You will still need to set up the user accounts to begin with:
|
||||||
|
# $ sudo smbpasswd -a yourusername
|
||||||
|
homes = {
|
||||||
|
browseable = "no";
|
||||||
|
"read only" = "no";
|
||||||
|
"guest ok" = "no";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
hyprctl dispatch exec -- "[float;size 1829 1029] gamescope --scaler integer \
|
gamescope --scaler integer \
|
||||||
--force-windows-fullscreen -f --rt -- vmware"
|
--force-windows-fullscreen -f --rt -- vmware
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
Loading…
Reference in New Issue