diff --git a/custom/default.nix b/custom/default.nix index 85f4da7..bb72678 100644 --- a/custom/default.nix +++ b/custom/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import { inherit system; } +{ pkgs ? import { inherit system; } , system ? builtins.currentSystem }: diff --git a/home.nix b/home.nix index 0e300f6..3c08d5c 100644 --- a/home.nix +++ b/home.nix @@ -1,9 +1,6 @@ { pkgs, lib, ... }: let - nixpkgs = import {}; - nixos-unstable = import {}; - nixos = import {}; nix-rice = fetchTarball { url = "https://github.com/bertof/nix-rice/archive/refs/tags/v0.1.2.tar.gz"; sha256 = "15f97nwwvk828vnx6kk325zzjn4q37hrpp9aiqiz2qhfs06mr147"; @@ -100,8 +97,8 @@ in keepassxc krita libreoffice-fresh - lutris - megasync + lutris-free + megacmd mpv neofetch nerdfonts @@ -117,6 +114,7 @@ in skypeforlinux slack spotify + tdesktop teams transmission-gtk virt-manager @@ -149,16 +147,9 @@ in ]; } ) - ] ++ ( - with nixos; [ - tdesktop - - ] - ); + ]; }; - programs.zsh.enable = true; - imports = [ ./modules/configurations.nix @@ -187,6 +178,7 @@ in ./modules/libinput-gestures.nix ./modules/lorri.nix ./modules/man.nix + ./modules/mangohud.nix # ./modules/nix-index.nix ./modules/noti.nix ./modules/obs-studio.nix @@ -203,7 +195,7 @@ in ./modules/terminator.nix ./modules/tmux.nix ./modules/update_background.nix - # ./modules/xidelhook.nix + ./modules/xidlehook.nix # ./modules/zathura.nix ./modules/zoxide.nix ./modules/zsh.nix diff --git a/modules/bottom.nix b/modules/bottom.nix index 5688b27..8c556f3 100644 --- a/modules/bottom.nix +++ b/modules/bottom.nix @@ -1,9 +1,8 @@ { pkgs, lib, ... }: let - unstable = import {}; tomlGenerate = (pkgs.formats.toml {}).generate "bottom-toml"; in { - home.packages = with unstable; [ bottom ]; + home.packages = with pkgs; [ bottom ]; xdg.configFile."bottom/bottom.toml".source = tomlGenerate { "flags" = { "left_legend" = true; diff --git a/modules/kakoune.nix b/modules/kakoune.nix index 214007c..f737099 100644 --- a/modules/kakoune.nix +++ b/modules/kakoune.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, ... }: let - nixpkgs = import {}; kakCmd = "kak"; rustPlugins = with pkgs; [ @@ -125,9 +124,6 @@ in kakounePlugins.kak-lsp kakounePlugins.powerline-kak kakounePlugins.prelude-kak - ] - ) ++ ( - with nixpkgs; [ kakounePlugins.connect-kak ] ) ++ rustPlugins ++ cppPlugins ++ pythonPlugins ++ latexPlugins ++ nixPlugins ++ spellingPlugins ++ dataFormats; diff --git a/modules/mangohud.nix b/modules/mangohud.nix new file mode 100644 index 0000000..6b6c175 --- /dev/null +++ b/modules/mangohud.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + programs.mangohud = { + enable = true; + enableSessionWide = true; + }; +} diff --git a/modules/obs-studio.nix b/modules/obs-studio.nix index d59117c..35aca65 100644 --- a/modules/obs-studio.nix +++ b/modules/obs-studio.nix @@ -1,11 +1,7 @@ { pkgs, ... }: -let - nixpkgs = import nixpkgs {}; -in { programs.obs-studio = { enable = true; - # package = nixpkgs.obs-studio; plugins = with pkgs.obs-studio-plugins; [ # obs-linuxbrowser # obs-gstreamer diff --git a/modules/pro_audio.nix b/modules/pro_audio.nix index a4caaf5..7870369 100644 --- a/modules/pro_audio.nix +++ b/modules/pro_audio.nix @@ -12,7 +12,7 @@ let in { home.packages = with pkgs; [ - ardour + # ardour carla @@ -20,7 +20,7 @@ in boops geonkick lsp-plugins - noise-repellent + # noise-repellent speech-denoiser stochas surge diff --git a/modules/screen_locker.nix b/modules/screen_locker.nix index c0d39a5..c3d4643 100644 --- a/modules/screen_locker.nix +++ b/modules/screen_locker.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { services.screen-locker = { - enable = true; + enable = false; lockCmd = "${pkgs.lockscreen}"; inactiveInterval = 10; # miutes }; diff --git a/modules/security.nix b/modules/security.nix index 37e0741..200911b 100644 --- a/modules/security.nix +++ b/modules/security.nix @@ -3,7 +3,7 @@ home.packages = with pkgs; [ # WEB postman - burpsuite + # burpsuite httpie # REVERSING diff --git a/modules/xidelhook.nix b/modules/xidelhook.nix deleted file mode 100644 index 74d2978..0000000 --- a/modules/xidelhook.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, lib, ... }: - -with lib; - -let - program = "${pkgs.xidlehook}/bin/xidlehook"; - lockCmd = escapeShellArg '' ${pkgs.i3lock-color}/bin/i3lock-color -B 10 --greeter-text="Welcome back $USER" --greeter-color="#ffffff" --date-color="#ffffff" --time-color="#ffffff" ''; - script = concatStringsSep " " [ - ''${program}'' - ''--not-when-fullscreen'' - ''--not-when-audio'' - ''--timer 300 ${lockCmd} ""'' - ]; -in -{ - systemd.user.services.xidlehook = { - Unit = { - Description = "xidlehook service"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - ConditionEnvironment = [ "DISPLAY" ]; - }; - Service = { - Type = "simple"; - ExecStart = "${script}"; - }; - Install.WantedBy = [ "graphical-session.target" ]; - }; -} diff --git a/modules/xidlehook.nix b/modules/xidlehook.nix new file mode 100644 index 0000000..5cc109c --- /dev/null +++ b/modules/xidlehook.nix @@ -0,0 +1,33 @@ +{ pkgs, lib, ... }: + +with lib; + +let + xscreensaverCmd = "${pkgs.xscreensaver}/bin/xscreensaver-command -activate"; + lockCmd = "${pkgs.lockscreen}"; +in +{ + services.xidlehook = { + enable = true; + # not-when-audio = false; + not-when-fullscreen = true; + timers = [ + { + command = lockCmd; + delay = 120; + } + { + command = xscreensaverCmd; + delay = 300; + } + ]; + }; + services.xscreensaver = { + enable = true; + settings = { + mode = "blank"; + fadeTicks = 20; + lock = false; + }; + }; +} diff --git a/nixos/base.nix b/nixos/base.nix index abf82d4..2d6498b 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -78,7 +78,7 @@ services.xserver.xkbOptions = "eurosign:e;"; # Enable CUPS to print documents. - services.printing.enable = true; + # services.printing.enable = true; # Enable sound. # PULSE