diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 2c97fad..8d225ce 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -9,7 +9,7 @@ ... }: let # pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system}; - pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small { inherit (pkgs) system config; }; + pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small {inherit (pkgs) system config;}; pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; in { imports = [ @@ -300,7 +300,7 @@ in { # shotcut # openshot-qt # introduces python: screenkey - + # avidemux # broken handbrake diff --git a/nix/home-manager/configuration/text-minimal.nix b/nix/home-manager/configuration/text-minimal.nix index 5076924..e142742 100644 --- a/nix/home-manager/configuration/text-minimal.nix +++ b/nix/home-manager/configuration/text-minimal.nix @@ -4,7 +4,7 @@ ../programs/neovim.nix # ../programs/zsh.nix ]; - + home.packages = with pkgs; [ iperf3 inetutils diff --git a/nix/home-manager/profiles/experimental-desktop.nix b/nix/home-manager/profiles/experimental-desktop.nix index 96daa60..13d87d7 100644 --- a/nix/home-manager/profiles/experimental-desktop.nix +++ b/nix/home-manager/profiles/experimental-desktop.nix @@ -9,7 +9,7 @@ pkgsUnstable = pkgs.callPackage nodeFlake.inputs.nixpkgs-unstable.outPath {}; in { imports = [ - ../profiles/wayland-desktop.nix + ../profiles/wayland-desktop.nix ]; home.packages = [ diff --git a/nix/home-manager/profiles/gnome-desktop.nix b/nix/home-manager/profiles/gnome-desktop.nix index 5ad7113..b0a7a7b 100644 --- a/nix/home-manager/profiles/gnome-desktop.nix +++ b/nix/home-manager/profiles/gnome-desktop.nix @@ -6,7 +6,7 @@ }: let in { imports = [ - ../profiles/wayland-desktop.nix + ../profiles/wayland-desktop.nix ]; services = { @@ -68,11 +68,12 @@ in { # disable the builtin [1-9] functionality "org/gnome/shell/keybindings" = builtins.listToAttrs ((builtins.genList - (i: { - name = "switch-to-application-${toString (i + 1)}"; - value = []; - }) - numWorkspaces) ++ [ + (i: { + name = "switch-to-application-${toString (i + 1)}"; + value = []; + }) + numWorkspaces) + ++ [ { name = "toggle-overview"; value = []; diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index d69bde2..bee4d5f 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -31,7 +31,7 @@ in { # TODO: doesn't work with 2 screens # flameshot.enable = true; }; - + services.dunst = { enable = true; }; diff --git a/nix/home-manager/programs/chromium.nix b/nix/home-manager/programs/chromium.nix index dda9b61..9d3d5ae 100644 --- a/nix/home-manager/programs/chromium.nix +++ b/nix/home-manager/programs/chromium.nix @@ -3,47 +3,46 @@ lib, ... }: let - extensions = - [ - #undetectable adblocker - {id = "gcfcpohokifjldeandkfjoboemihipmb";} + extensions = + [ + #undetectable adblocker + {id = "gcfcpohokifjldeandkfjoboemihipmb";} - # ublock origin - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} + # ublock origin + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} - # # YT ad block - # {id = "cmedhionkhpnakcndndgjdbohmhepckk";} + # # YT ad block + # {id = "cmedhionkhpnakcndndgjdbohmhepckk";} - # # Adblock Plus - # {id = "cfhdojbkjhnklbpkdaibdccddilifddb";} + # # Adblock Plus + # {id = "cfhdojbkjhnklbpkdaibdccddilifddb";} - # Cookie Notice Blocker - {id = "odhmfmnoejhihkmfebnolljiibpnednn";} - # i don't care about cookies - {id = "fihnjjcciajhdojfnbdddfaoknhalnja";} + # Cookie Notice Blocker + {id = "odhmfmnoejhihkmfebnolljiibpnednn";} + # i don't care about cookies + {id = "fihnjjcciajhdojfnbdddfaoknhalnja";} - # NopeCHA - {id = "dknlfmjaanfblgfdfebhijalfmhmjjjo";} + # NopeCHA + {id = "dknlfmjaanfblgfdfebhijalfmhmjjjo";} - # h264ify - {id = "aleakchihdccplidncghkekgioiakgal";} + # h264ify + {id = "aleakchihdccplidncghkekgioiakgal";} - # clippy - # {id = "honbeilkanbghjimjoniipnnehlmhggk"} + # clippy + # {id = "honbeilkanbghjimjoniipnnehlmhggk"} - { - id = "dcpihecpambacapedldabdbpakmachpb"; - updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml"; - } - - # cookie autodelete - {id = "fhcgjolkccmbidfldomjliifgaodjagh";} - ] - ++ (lib.lists.optionals ((builtins.match "^steveej.*" name) != null) [ - # Vimium C - {id = "hfjbmagddngcpeloejdejnfgbamkjaeg";} - ]); + { + id = "dcpihecpambacapedldabdbpakmachpb"; + updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml"; + } + # cookie autodelete + {id = "fhcgjolkccmbidfldomjliifgaodjagh";} + ] + ++ (lib.lists.optionals ((builtins.match "^steveej.*" name) != null) [ + # Vimium C + {id = "hfjbmagddngcpeloejdejnfgbamkjaeg";} + ]); in { programs.chromium = { enable = true; diff --git a/nix/home-manager/programs/espanso.nix b/nix/home-manager/programs/espanso.nix index 80f96ab..9de6eea 100644 --- a/nix/home-manager/programs/espanso.nix +++ b/nix/home-manager/programs/espanso.nix @@ -1,70 +1,68 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { services.espanso = { # package = pkgs.espanso.overrideAttrs(_: { # # src = # }) enable = true; - configs = { - default = { - # backend = "Inject"; - # backend = "Clipboard"; - }; + configs = { + default = { + # backend = "Inject"; + # backend = "Clipboard"; }; - matches = let - playerctl = '' - ${pkgs.coreutils}/bin/env DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(${pkgs.coreutils}/bin/id -u)/bus" ${pkgs.playerctl}/bin/playerctl''; - in { - default = { matches = [ - { - trigger = ":vpos"; - replace = "{{output}}"; - vars = [ - { - name = "output"; - type = "script"; - params = { - args = [ - (pkgs.writeScript "espanso" '' - #! ${pkgs.python3}/bin/python - import subprocess, os, math, datetime + }; + matches = let + playerctl = '' + ${pkgs.coreutils}/bin/env DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(${pkgs.coreutils}/bin/id -u)/bus" ${pkgs.playerctl}/bin/playerctl''; + in { + default = { + matches = [ + { + trigger = ":vpos"; + replace = "{{output}}"; + vars = [ + { + name = "output"; + type = "script"; + params = { + args = [ + (pkgs.writeScript "espanso" '' + #! ${pkgs.python3}/bin/python + import subprocess, os, math, datetime - id=str(os.getuid()) - result=subprocess.run(args=["${pkgs.playerctl}/bin/playerctl", "position"], env={"DBUS_SESSION_BUS_ADDRESS": "unix:path=/run/user/"+id+"/bus"},capture_output=True) - result.check_returncode() + id=str(os.getuid()) + result=subprocess.run(args=["${pkgs.playerctl}/bin/playerctl", "position"], env={"DBUS_SESSION_BUS_ADDRESS": "unix:path=/run/user/"+id+"/bus"},capture_output=True) + result.check_returncode() - position_secs = math.trunc(float(result.stdout)) - position_human = datetime.timedelta(seconds=position_secs) - print("%s - %s" % (position_human, position_secs)) - '') - ]; - }; - } - ]; - } - { - trigger = ":vtit"; - replace = "{{output}}"; - vars = [ - { - name = "output"; - type = "script"; - params = { - args = [ - (pkgs.writeShellScript "espanso" - "${playerctl} metadata title") - ]; - }; - } - ]; - } - { - trigger = ":dunno"; - replace = "¯\\_(ツ)_/¯"; - } - ]; + position_secs = math.trunc(float(result.stdout)) + position_human = datetime.timedelta(seconds=position_secs) + print("%s - %s" % (position_human, position_secs)) + '') + ]; + }; + } + ]; + } + { + trigger = ":vtit"; + replace = "{{output}}"; + vars = [ + { + name = "output"; + type = "script"; + params = { + args = [ + (pkgs.writeShellScript "espanso" + "${playerctl} metadata title") + ]; + }; + } + ]; + } + { + trigger = ":dunno"; + replace = "¯\\_(ツ)_/¯"; + } + ]; }; }; }; diff --git a/nix/home-manager/programs/gpg-agent.nix b/nix/home-manager/programs/gpg-agent.nix index 79ce675..5fff979 100644 --- a/nix/home-manager/programs/gpg-agent.nix +++ b/nix/home-manager/programs/gpg-agent.nix @@ -1,11 +1,20 @@ -{lib, pkgs, config, ...}: { - home.packages = [ - pkgs.gcr - ] ++ - (if config.services.gpg-agent.pinentryFlavor == "gtk2" then [pkgs.pinentry-gtk2] - else if config.services.gpg-agent.pinentryFlavor == "gnome3" then [pkgs.pinentry-gnome] - else []) - ; +{ + lib, + pkgs, + config, + ... +}: { + home.packages = + [ + pkgs.gcr + ] + ++ ( + if config.services.gpg-agent.pinentryFlavor == "gtk2" + then [pkgs.pinentry-gtk2] + else if config.services.gpg-agent.pinentryFlavor == "gnome3" + then [pkgs.pinentry-gnome] + else [] + ); programs.gpg.enable = true; services.gpg-agent = { diff --git a/nix/home-manager/programs/pass.nix b/nix/home-manager/programs/pass.nix index 2be5230..e20bbb4 100644 --- a/nix/home-manager/programs/pass.nix +++ b/nix/home-manager/programs/pass.nix @@ -6,12 +6,12 @@ programs.browserpass.enable = true; home.packages = with pkgs; [ - gnupg - pass + gnupg + pass - # broken on wayland - # rofi-pass + # broken on wayland + # rofi-pass - prs + prs ]; } diff --git a/nix/home-manager/programs/salut.nix b/nix/home-manager/programs/salut.nix index 1d39b5e..6a2894d 100644 --- a/nix/home-manager/programs/salut.nix +++ b/nix/home-manager/programs/salut.nix @@ -7,11 +7,9 @@ }: # useful testing command: # for i in `seq 0 10`; do nix shell nixpkgs#libnotify --command notify-send notifiiiiiii "$i"; sleep 1; done - let inherit (import ../lib.nix {}) mkSimpleTrayService; -in -{ +in { home.packages = [ packages'.salut ]; diff --git a/nix/os/cachix.nix b/nix/os/cachix.nix index 332fc55..d888840 100644 --- a/nix/os/cachix.nix +++ b/nix/os/cachix.nix @@ -1,8 +1,9 @@ - # WARN: this file will get overwritten by $ cachix use -{ pkgs, lib, ... }: - -let +{ + pkgs, + lib, + ... +}: let folder = ./cachix; toImport = name: value: folder + ("/" + name); filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; @@ -11,4 +12,3 @@ in { inherit imports; nix.settings.substituters = ["https://cache.nixos.org/"]; } - diff --git a/nix/os/cachix/nixpkgs-wayland.nix b/nix/os/cachix/nixpkgs-wayland.nix index e370450..499e6e0 100644 --- a/nix/os/cachix/nixpkgs-wayland.nix +++ b/nix/os/cachix/nixpkgs-wayland.nix @@ -1,4 +1,3 @@ - { nix = { settings.substituters = [ @@ -9,4 +8,3 @@ ]; }; } - diff --git a/nix/os/devices/sj-bm-hostkey0/configuration.nix b/nix/os/devices/sj-bm-hostkey0/configuration.nix index 9c24e67..9374621 100644 --- a/nix/os/devices/sj-bm-hostkey0/configuration.nix +++ b/nix/os/devices/sj-bm-hostkey0/configuration.nix @@ -9,8 +9,7 @@ nodeName, system, ... -}: let -in { +}: { disabledModules = [ # "services/networking/hostapd.nix" ]; @@ -34,11 +33,11 @@ in { }; } ]; - + nix.nixPath = [ "nixpkgs=${pkgs.path}" ]; - + nix.registry = { nixpkgs.to = { type = "path"; @@ -46,7 +45,7 @@ in { }; }; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; boot = { kernel = { @@ -131,8 +130,7 @@ in { environment.systemPackages = [ pkgs.hdparm ]; - - + # home-manager.users.steveej = _: { # imports = [ # ../../../home-manager/configuration/text-minimal.nix diff --git a/nix/os/devices/steveej-t14/hw.nix b/nix/os/devices/steveej-t14/hw.nix index 9f7d778..112a291 100644 --- a/nix/os/devices/steveej-t14/hw.nix +++ b/nix/os/devices/steveej-t14/hw.nix @@ -24,40 +24,40 @@ in { CPU_SCALING_GOVERNOR_ON_BAT = "schedutil"; # CPU_ENERGY_PERF_POLICY_ON_AC="balance_power"; - CPU_ENERGY_PERF_POLICY_ON_BAT="power"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; # SCHED_POWERSAVE_ON_AC="1"; - SCHED_POWERSAVE_ON_BAT="1"; + SCHED_POWERSAVE_ON_BAT = "1"; - CPU_BOOST_ON_AC="0"; - CPU_BOOST_ON_BAT="0"; + CPU_BOOST_ON_AC = "0"; + CPU_BOOST_ON_BAT = "0"; # RADEON_DPM_PERF_LEVEL_ON_AC="auto"; - RADEON_DPM_PERF_LEVEL_ON_BAT="low"; + RADEON_DPM_PERF_LEVEL_ON_BAT = "low"; # RADEON_DPM_STATE_ON_AC="balanced"; - RADEON_DPM_STATE_ON_BAT="battery"; + RADEON_DPM_STATE_ON_BAT = "battery"; # SOUND_POWER_SAVE_ON_AC="1"; - SOUND_POWER_SAVE_ON_BAT="1"; + SOUND_POWER_SAVE_ON_BAT = "1"; # # PLATFORM_PROFILE_ON_AC="low-power"; # # PLATFORM_PROFILE_ON_BAT="low-power"; # PLATFORM_PROFILE_ON_AC="balanced"; - PLATFORM_PROFILE_ON_BAT="low-power"; + PLATFORM_PROFILE_ON_BAT = "low-power"; # RUNTIME_PM_ON_AC = "auto"; RUNTIME_PM_ON_BAT = "auto"; # PCIE_ASPM_ON_AC="default"; - PCIE_ASPM_ON_BAT="powersave"; + PCIE_ASPM_ON_BAT = "powersave"; START_CHARGE_THRESH_BAT0 = "75"; STOP_CHARGE_THRESH_BAT0 = "80"; - WOL_DISABLE="Y"; + WOL_DISABLE = "Y"; # WIFI_PWR_ON_AC="on"; - WIFI_PWR_ON_BAT="on"; - DEVICES_TO_DISABLE_ON_STARTUP="wwan"; + WIFI_PWR_ON_BAT = "on"; + DEVICES_TO_DISABLE_ON_STARTUP = "wwan"; # #DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan"; # #DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan"; # #DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi"; @@ -67,20 +67,19 @@ in { services.thinkfan = { enable = true; levels = [ - [0 0 55] - [1 55 65] - [1 65 75] - [2 75 78] - [3 78 80] - [4 80 82] - [5 82 84] - [6 84 86] - [7 86 88] - ["level full-speed" 88 999] + [0 0 55] + [1 55 65] + [1 65 75] + [2 75 78] + [3 78 80] + [4 80 82] + [5 82 84] + [6 84 86] + [7 86 88] + ["level full-speed" 88 999] ]; }; - # boot.initrd.availableKernelModules = stage1Modules; boot.initrd.kernelModules = stage1Modules; } diff --git a/nix/os/devices/steveej-t14/system.nix b/nix/os/devices/steveej-t14/system.nix index 078e0fe..062e505 100644 --- a/nix/os/devices/steveej-t14/system.nix +++ b/nix/os/devices/steveej-t14/system.nix @@ -100,8 +100,7 @@ in { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; }; - environment.systemPackages = with pkgs; [ lxqt.lxqt-policykit ]; # provides a default authentification client for policykit - + environment.systemPackages = with pkgs; [lxqt.lxqt-policykit]; # provides a default authentification client for policykit security.pki.certificateFiles = ["${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"]; diff --git a/nix/os/profiles/graphical-gnome-xorg.nix b/nix/os/profiles/graphical-gnome-xorg.nix index 8cf3c58..bfd4036 100644 --- a/nix/os/profiles/graphical-gnome-xorg.nix +++ b/nix/os/profiles/graphical-gnome-xorg.nix @@ -36,7 +36,6 @@ }; }; - # gnome, most of it is disabled and ideally it could live entirely in the user's home config programs.gpaste.enable = false; programs.gnome-terminal.enable = false; diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index 2e125c0..87b1bd0 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -18,7 +18,6 @@ services.resolved.enable = true; - # hardware related services services.illum.enable = true; services.pcscd.enable = true; diff --git a/nix/pkgs/jay.nix b/nix/pkgs/jay.nix index 634de0c..a4c2db4 100644 --- a/nix/pkgs/jay.nix +++ b/nix/pkgs/jay.nix @@ -1,13 +1,13 @@ -{ lib -, src -, rustPlatform -, libinput -, libxkbcommon -, mesa -, pango -, udev +{ + lib, + src, + rustPlatform, + libinput, + libxkbcommon, + mesa, + pango, + udev, }: - rustPlatform.buildRustPackage rec { pname = "jay"; version = src.rev; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "A Wayland compositor written in Rust"; homepage = "https://github.com/mahkoh/jay"; license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + maintainers = with maintainers; [dit7ya]; }; } diff --git a/nix/pkgs/magmawm.nix b/nix/pkgs/magmawm.nix index 23445cc..2d4c335 100644 --- a/nix/pkgs/magmawm.nix +++ b/nix/pkgs/magmawm.nix @@ -1,20 +1,20 @@ -{ lib -, src -, craneLib - -, pkg-config -, wayland -, libseat -, libinput -, libxkbcommon -, mesa -, pango -, udev -, dbus -, libGL +{ + lib, + src, + craneLib, + pkg-config, + wayland, + libseat, + libinput, + libxkbcommon, + mesa, + pango, + udev, + dbus, + libGL, }: - -craneLib.buildPackage {inherit src; +craneLib.buildPackage { + inherit src; pname = "magmawm"; version = src.rev; @@ -44,7 +44,7 @@ craneLib.buildPackage {inherit src; description = "A versatile and customizable Window Manager and Wayland Compositor"; homepage = "https://github.com/MagmaWM/MagmaWM"; license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.linux; + maintainers = with maintainers; []; }; }