Compare commits

...

5 Commits

Author SHA1 Message Date
00f6800290 added mpv to desktop 2026-07-30 19:38:12 +01:00
56aed1cf2d trying to fix davinci recording 2026-07-30 19:37:52 +01:00
88266b040f added server02 hostname block to ohmyposh 2026-07-29 17:46:43 +01:00
5f7fc8ea05 added warning for flakeLocation being null instead of an assert 2026-07-29 17:26:14 +01:00
3a634375a0 updated quickshell 2026-07-29 17:16:49 +01:00
5 changed files with 91 additions and 73 deletions

8
flake.lock generated
View File

@@ -1031,11 +1031,11 @@
"quickshell": {
"flake": false,
"locked": {
"lastModified": 1783436659,
"narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=",
"lastModified": 1785316762,
"narHash": "sha256-YDCoSJbBsugRcugBSh4mgwaQkz51RbMEjMxPgZPsNoA=",
"ref": "refs/heads/main",
"rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19",
"revCount": 25,
"rev": "afbe360b080f349d27359b8507ce429aaa5a5a7e",
"revCount": 26,
"type": "git",
"url": "https://git.voidarc.co.uk/voidarc/quickshell"
},

View File

@@ -34,6 +34,11 @@ template = '''
{{- end -}}
'''
[[blocks.segments]] # Hostname
type = 'text'
style = 'plain'
template = '{{ if eq .HostName "server02" }}<green>󰒋 {{.HostName}}</> <#7f849c>|</> {{ end }}'
[[blocks.segments]] # Python venv
type = 'text'
style = 'plain'

View File

@@ -33,7 +33,7 @@
zsh = let
flakeLocation = builtins.getEnv "PWD";
in
assert flakeLocation != "";
lib.warnIf (flakeLocation == "") "Flake Location is undefined. Are you building in the right directory?"
inputs.wrappers.wrappers.zsh.wrap {
inherit pkgs;
runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
@@ -44,8 +44,14 @@
lg = lib.getExe pkgs.lazygit;
man = "man -P \"${lib.getExe pkgs.bat} -p\"";
nsh = "nix-shell -p";
nrs = "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )";
vinix = "nvim --cmd 'cd ${flakeLocation}'";
nrs =
if flakeLocation != ""
then "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )"
else "echo 'Flake location not specified. Did you build with --impure?'";
vinix =
if flakeLocation != ""
then "nvim --cmd 'cd ${flakeLocation}'"
else "echo 'Flake location not specified. Did you build with --impure?'";
};
zshrc.content = ''
source ${./devenv.zsh}

View File

@@ -11,9 +11,13 @@
environment.systemPackages = with pkgs; [
playerctl
pavucontrol
pulseaudioFull
];
services.pulseaudio.enable = false;
security.rtkit.enable = true;
nixpkgs.config.pulseaudio = true;
services.pipewire = {
enable = true;
alsa.enable = true;

View File

@@ -3,7 +3,7 @@
moduleWithSystem,
...
}: {
flake.nixosModules.desktop = moduleWithSystem ({...}: let
flake.nixosModules.desktop = moduleWithSystem ({pkgs, ...}: let
modules = with self.nixosModules; [
core
hyprland
@@ -13,5 +13,8 @@
];
in {
imports = modules;
environment.systemPackages = with pkgs; [
mpv
];
});
}