Compare commits
5 Commits
7a3d2fee77
...
00f6800290
| Author | SHA1 | Date | |
|---|---|---|---|
| 00f6800290 | |||
| 56aed1cf2d | |||
| 88266b040f | |||
| 5f7fc8ea05 | |||
| 3a634375a0 |
8
flake.lock
generated
8
flake.lock
generated
@@ -1031,11 +1031,11 @@
|
|||||||
"quickshell": {
|
"quickshell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1783436659,
|
"lastModified": 1785316762,
|
||||||
"narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=",
|
"narHash": "sha256-YDCoSJbBsugRcugBSh4mgwaQkz51RbMEjMxPgZPsNoA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19",
|
"rev": "afbe360b080f349d27359b8507ce429aaa5a5a7e",
|
||||||
"revCount": 25,
|
"revCount": 26,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.voidarc.co.uk/voidarc/quickshell"
|
"url": "https://git.voidarc.co.uk/voidarc/quickshell"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -34,6 +34,11 @@ template = '''
|
|||||||
{{- end -}}
|
{{- end -}}
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
[[blocks.segments]] # Hostname
|
||||||
|
type = 'text'
|
||||||
|
style = 'plain'
|
||||||
|
template = '{{ if eq .HostName "server02" }}<green> {{.HostName}}</> <#7f849c>|</> {{ end }}'
|
||||||
|
|
||||||
[[blocks.segments]] # Python venv
|
[[blocks.segments]] # Python venv
|
||||||
type = 'text'
|
type = 'text'
|
||||||
style = 'plain'
|
style = 'plain'
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
zsh = let
|
zsh = let
|
||||||
flakeLocation = builtins.getEnv "PWD";
|
flakeLocation = builtins.getEnv "PWD";
|
||||||
in
|
in
|
||||||
assert flakeLocation != "";
|
lib.warnIf (flakeLocation == "") "Flake Location is undefined. Are you building in the right directory?"
|
||||||
inputs.wrappers.wrappers.zsh.wrap {
|
inputs.wrappers.wrappers.zsh.wrap {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
|
runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
|
||||||
@@ -44,8 +44,14 @@
|
|||||||
lg = lib.getExe pkgs.lazygit;
|
lg = lib.getExe pkgs.lazygit;
|
||||||
man = "man -P \"${lib.getExe pkgs.bat} -p\"";
|
man = "man -P \"${lib.getExe pkgs.bat} -p\"";
|
||||||
nsh = "nix-shell -p";
|
nsh = "nix-shell -p";
|
||||||
nrs = "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )";
|
nrs =
|
||||||
vinix = "nvim --cmd 'cd ${flakeLocation}'";
|
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 = ''
|
zshrc.content = ''
|
||||||
source ${./devenv.zsh}
|
source ${./devenv.zsh}
|
||||||
|
|||||||
@@ -11,9 +11,13 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
playerctl
|
playerctl
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
pulseaudioFull
|
||||||
];
|
];
|
||||||
services.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
|
nixpkgs.config.pulseaudio = true;
|
||||||
|
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
moduleWithSystem,
|
moduleWithSystem,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
flake.nixosModules.desktop = moduleWithSystem ({...}: let
|
flake.nixosModules.desktop = moduleWithSystem ({pkgs, ...}: let
|
||||||
modules = with self.nixosModules; [
|
modules = with self.nixosModules; [
|
||||||
core
|
core
|
||||||
hyprland
|
hyprland
|
||||||
@@ -13,5 +13,8 @@
|
|||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
imports = modules;
|
imports = modules;
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
mpv
|
||||||
|
];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user