nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:a680781cc49acbba6d8b03553875904caec1ae4d
Branches Tags
nix:trunk
..
compare: nix:e9eb8cc17a93fdfcdf5124f95c097e0764b76b8c
Branches Tags
nix:trunk

No commits in common. "a680781cc49acbba6d8b03553875904caec1ae4d" and "e9eb8cc17a93fdfcdf5124f95c097e0764b76b8c" have entirely different histories.
a680781cc4 ... e9eb8cc17a

8 changed files with 244 additions and 344 deletions
Show Stats Expand all files Collapse all files

66
flake.lock
View File

@ -176,12 +176,8 @@
},
"hyprland": {
"inputs": {
"hyprland-protocols": [
"hyprland-protocols"
],
"nixpkgs": [
"nixpkgs"
],
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
@ -201,7 +197,7 @@
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1687033460,
@ -220,6 +216,7 @@
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
@ -483,6 +480,22 @@
}
},
"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": {
"lastModified": 1658161305,
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
@ -498,7 +511,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1688566749,
"narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=",
@ -514,7 +527,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1667292599,
"narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
@ -530,7 +543,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1667085676,
"narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=",
@ -623,25 +636,23 @@
"home-manager": "home-manager",
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"hyprland-protocols": "hyprland-protocols",
"idris2": "idris2",
"java": "java",
"nix-on-droid": "nix-on-droid",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable",
"quilt-server": "quilt-server",
"scripts": "scripts",
"sops-nix": "sops-nix",
"wsl": "wsl",
"xdph": "xdph_2"
"wsl": "wsl"
}
},
"scripts": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"swaywm-toggler": "swaywm-toggler"
},
"locked": {
@ -683,7 +694,7 @@
"swaywm-toggler": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1667366374,
@ -824,29 +835,6 @@
"repo": "xdg-desktop-portal-hyprland",
"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",

15
flake.nix
View File

@ -9,20 +9,7 @@
url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs";
};
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.url = "github:hyprwm/Hyprland";
hyprland-contrib.url = "github:hyprwm/contrib";
nix-on-droid = {
url = "github:t184256/nix-on-droid";

7
home-manager/linux/programs/desktop/general.nix
View File

@ -6,7 +6,12 @@ let
shortcuts = inputs.self.packages.${pkgs.system}.shortcuts;
in lib.mkMerge [
# 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
(lib.mkIf hyprland {
home.packages = with pkgs; [

54
home-manager/linux/programs/hyprland.nix
View File

@ -1,13 +1,5 @@
{ config, lib, pkgs, inputs, ... }@args:
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;
};
};
let nathan = config.nathan;
in with lib; {
imports = [
./desktop/waybar.nix
@ -42,24 +34,12 @@ in with lib; {
recommendedEnvironment = true;
systemdIntegration = false;
extraConfig = ''
# import home manager session variables
${lib.concatStringsSep "\n" (builtins.attrValues
(builtins.mapAttrs (name: value: "env = ${name},${value}")
config.home.sessionVariables))}
# 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
# Set environment variables to force wayland
env = XCURSOR_SIZE,24
# env = GDK_BACKEND,wayland,x11
# env = QT_QPA_PLATFORM,wayland;xcb
# env = SDL_VIDEODRIVER,wayland
# env = CLUTTER_BACKEND,wayland
input {
kb_layout = us
kb_variant =
@ -203,22 +183,8 @@ in with lib; {
bindr = CAPS, caps_lock, exec, swayosd --caps-lock
# systemd integration
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
exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 2 && systemctl --user start hyprland-session.target
## Window rules
@ -268,8 +234,6 @@ in with lib; {
# Emacs streaming
windowrulev2 = float,title:^(emacs-streaming)$
# Looking Glass
## Scratchpads
# Alacritty

1
machines/levitation/configuration.nix
View File

@ -98,7 +98,6 @@ in {
# ZFS
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.forceImportRoot = false;
boot.zfs.extraPools = [ "bigssd" ];
# Generated with head -c4 /dev/urandom | od -A none -t x4
networking.hostId = "bc94e9d3";
}

14
machines/levitation/home.nix
View File

@ -90,18 +90,4 @@
};
};
# Looking glass
xdg.configFile."looking-glass/client.ini" = {
text = ''
[input]
rawMouse=yes
[audio]
periodSize=512
bufferLatency=7
micDefault=allow
[egl]
scale = 1
'';
};
}

31
machines/levitation/passthrough.nix
View File

@ -8,15 +8,6 @@ let
"10de:1ad9" # Usb ????
];
in {
##
## Packages
##
environment.systemPackages = with pkgs; [
# Looking glass, avoids the need for another monitor
looking-glass-client
# For samba
cifs-utils
];
##
## Kernel configuration
##
@ -34,6 +25,7 @@ in {
##
## Virtualization setup
##
environment.systemPackages = with pkgs; [ looking-glass-client ];
virtualisation.spiceUSBRedirection.enable = true;
virtualisation.libvirtd = {
qemu = {
@ -63,25 +55,4 @@ in {
};
networking.defaultGateway = "10.0.4.1";
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";
};
};
};
}

4
shortcuts/vmware/fullscreen
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
gamescope --scaler integer \
--force-windows-fullscreen -f --rt -- vmware
hyprctl dispatch exec -- "[float;size 1829 1029] gamescope --scaler integer \
--force-windows-fullscreen -f --rt -- vmware"
wait