diff --git a/hosts/nixie/hardware.nix b/hosts/nixie/hardware.nix index 834f576..96ff19c 100644 --- a/hosts/nixie/hardware.nix +++ b/hosts/nixie/hardware.nix @@ -27,8 +27,7 @@ }; fileSystems."/mnt/ssd" = - { - device = "/dev/disk/by-uuid/1be9737c-ac7a-4445-9655-eee724a8fa4a"; + { device = "/dev/disk/by-uuid/0779ac7e-9ecc-43bc-b37e-7ceed4f2a906"; fsType = "ext4"; }; diff --git a/hosts/nixie/secrets/kontaktreg.py b/hosts/nixie/secrets/kontaktreg.py new file mode 100755 index 0000000..cd33000 Binary files /dev/null and b/hosts/nixie/secrets/kontaktreg.py differ diff --git a/hosts/nixie/secrets/reaper.nix b/hosts/nixie/secrets/reaper.nix index eec37e0..0b5eee1 100644 Binary files a/hosts/nixie/secrets/reaper.nix and b/hosts/nixie/secrets/reaper.nix differ diff --git a/modules/desktop/apps/reaper/configs/reaper.ini b/modules/desktop/apps/reaper/configs/reaper.ini index fc13712..872d65c 100644 --- a/modules/desktop/apps/reaper/configs/reaper.ini +++ b/modules/desktop/apps/reaper/configs/reaper.ini @@ -94,18 +94,18 @@ watch_lx=12 watch_ly=34 [midiedit] -colorwhat=2 +colorwhat=0 humanall=0 humanbias=0 humantiming=0 -humanvel=19 +humanvel=20 lane0=100 -1 0 lane1=100 128 0 lane2=100 -1 0 lastdrummode=16 lastsnap=1 -lastspac=0.25000000 -lastswing=0.500000 +lastspac=0.16666667 +lastswing=0.000000 lastvelhand=0 midikeystep=0 numlanes=1 @@ -119,11 +119,11 @@ quantstrength=100 quantswingstrength=0.500000 scnotes=0 shownotenames=1 -window_h=963 +window_h=979 window_max=0 -window_w=1848 -window_x=36 -window_y=58 +window_w=1864 +window_x=28 +window_y=50 [mp3 encoder defaults] default=6C33706D400100000000000002000000FFFFFFFF04000000400100000000000000 @@ -315,7 +315,7 @@ leftpanewid=382 linux_audio_bits=24 linux_audio_bsize=256 linux_audio_bufs=2 -linux_audio_mode=3 +linux_audio_mode=1 linux_audio_nch_in=2 linux_audio_nch_out=2 linux_audio_srate=48000 @@ -734,7 +734,7 @@ zoomshowarm=1 allp_root=1 cat_root=1 dev_root=1 -lastview=11 +lastview=0 uiflags=1611708896 userf_root=1 @@ -803,8 +803,8 @@ RecentFX16= [recentmetropat] cnt=3 -i0=AAAA -i1=ABBB +i0=ABBB +i1=AAAA i2=ABBB. [regmgr] @@ -889,7 +889,7 @@ lastt=1694186358 [vkb] arrowen=0 channel=0 -notecenter=36 +notecenter=24 wnd_height=191 wnd_left=576 wnd_top=444 diff --git a/modules/desktop/apps/reaper/default.nix b/modules/desktop/apps/reaper/default.nix index e1645b3..2440a63 100644 --- a/modules/desktop/apps/reaper/default.nix +++ b/modules/desktop/apps/reaper/default.nix @@ -136,7 +136,7 @@ let ]; in script; - preScript = '' + preScript = /* bash */ '' # Read timestamps REPOSTAMP=`cat "${files}/configs/nixtimestamp" 2>/dev/null || echo "1"` SYSTEMSTAMP=`cat "$HOME/.config/reaper/nixtimestamp" 2>/dev/null || echo "0"` @@ -150,6 +150,9 @@ let else ${postScript} fi + + ${mkLog "Running preRun hook..."} + ${cfg.extraPreRunScript} ''; postScript = '' diff --git a/modules/desktop/apps/reaper/options.nix b/modules/desktop/apps/reaper/options.nix index 5718824..0c34bfa 100644 --- a/modules/desktop/apps/reaper/options.nix +++ b/modules/desktop/apps/reaper/options.nix @@ -73,5 +73,10 @@ in { type = with types; listOf path; default = [ ]; }; + + extraPreRunScript = mkOption { + type = types.str; + default = ""; + }; }; } diff --git a/modules/desktop/core/rices/hyprpop/hyprland/default.nix b/modules/desktop/core/rices/hyprpop/hyprland/default.nix index af01c1b..5047d0c 100644 --- a/modules/desktop/core/rices/hyprpop/hyprland/default.nix +++ b/modules/desktop/core/rices/hyprpop/hyprland/default.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, lib, config, user, ... }: +{ lib, config, user, ... }: let inherit (lib) mkIf fileContents; inherit (config.colorScheme) palette; @@ -7,6 +7,7 @@ let in { imports = [ ./portal.nix + ./polkit.nix ./wallpaper.nix ]; diff --git a/modules/desktop/core/rices/hyprpop/hyprland/polkit.nix b/modules/desktop/core/rices/hyprpop/hyprland/polkit.nix new file mode 100644 index 0000000..4b60746 --- /dev/null +++ b/modules/desktop/core/rices/hyprpop/hyprland/polkit.nix @@ -0,0 +1,14 @@ +{ pkgs, lib, config, user, ... }: let + inherit (lib) mkIf; + theme = config.modules.desktop.theme; +in { + config = mkIf (theme.rice == "hyprpop") { + home-manager.users.${user} = { + wayland.windowManager.hyprland.extraConfig = '' + exec-once=${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 & + ''; + }; + + security.polkit.enable = true; + }; +} diff --git a/modules/desktop/dev/python.nix b/modules/desktop/dev/python.nix index f798c6e..ef5dcf8 100644 --- a/modules/desktop/dev/python.nix +++ b/modules/desktop/dev/python.nix @@ -30,6 +30,11 @@ let # pygame # pyppeteer + + django + django-tables2 + pandas + openpyxl ]; cfg = config.modules.desktop.dev.python;