From af86a44b46fb7ee7f17f789465685d82ce3ae092 Mon Sep 17 00:00:00 2001 From: tzlil Date: Tue, 16 May 2023 22:01:28 +0300 Subject: add back swaynag exit message, format --- hosts/laptop/cfg.nix | 6 +++--- mixins/sway.nix | 2 +- profiles/graphical.nix | 9 +++++++++ profiles/network.nix | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix index 8cf17d6..530ac34 100644 --- a/hosts/laptop/cfg.nix +++ b/hosts/laptop/cfg.nix @@ -88,7 +88,6 @@ networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; - # # iwd networking stuffs # networking.networkmanager.enable = lib.mkForce false; # networking.wireless.iwd.enable = true; @@ -102,7 +101,6 @@ # networking.wireless.enable = true; # services.connman.enable = true; - environment.persistence."/nix/persist".directories = [ "/etc/NetworkManager/system-connections" { @@ -112,7 +110,9 @@ } ]; - home-manager.users.tzlil.home.packages = [pkgs.schildichat-desktop pkgs.qutebrowser]; + home-manager.users.tzlil = { + home.packages = [pkgs.schildichat-desktop pkgs.qutebrowser pkgs.keepassxc]; + }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/mixins/sway.nix b/mixins/sway.nix index c12d156..42604b3 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -161,7 +161,7 @@ in { "${modifier}+q" = "kill"; "${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${menuscript} | xargs swaymsg exec --"; "${modifier}+Shift+c" = "reload"; - "${modifier}+Shift+q" = "exit"; + "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit'"; "${modifier}+Shift+p" = "exec systemctl poweroff"; "${modifier}+Shift+s" = "exec systemctl suspend"; "${modifier}+${left}" = "focus left"; diff --git a/profiles/graphical.nix b/profiles/graphical.nix index a4fa0cd..849634a 100644 --- a/profiles/graphical.nix +++ b/profiles/graphical.nix @@ -17,6 +17,15 @@ noto-fonts-cjk ]; + gtk = { + enable = true; + font.name = "Victor Mono SemiBold 12"; + theme = { + name = "SolArc-Dark"; + package = pkgs.solarc-gtk-theme; + }; + }; + # gtk = { # theme.package = pkgs.gnome.gnome-themes-extra; # theme.name = "Adwaita-dark"; diff --git a/profiles/network.nix b/profiles/network.nix index 90c5d47..c959824 100644 --- a/profiles/network.nix +++ b/profiles/network.nix @@ -49,7 +49,7 @@ }; # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md - server_names = [ ]; # tailscale magicdns + server_names = []; # tailscale magicdns }; }; -- cgit 1.4.1 From cd103868ca4fcd6da02a29ff09f37dc5ad3ad4ae Mon Sep 17 00:00:00 2001 From: tzlil Date: Tue, 16 May 2023 22:09:48 +0300 Subject: gtk is broken, make swaynag exit a little nicer --- mixins/sway.nix | 2 +- profiles/graphical.nix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mixins/sway.nix b/mixins/sway.nix index 42604b3..8917ffe 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -161,7 +161,7 @@ in { "${modifier}+q" = "kill"; "${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${menuscript} | xargs swaymsg exec --"; "${modifier}+Shift+c" = "reload"; - "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit'"; + "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit' -s 'no'"; "${modifier}+Shift+p" = "exec systemctl poweroff"; "${modifier}+Shift+s" = "exec systemctl suspend"; "${modifier}+${left}" = "focus left"; diff --git a/profiles/graphical.nix b/profiles/graphical.nix index 849634a..8ba6e7f 100644 --- a/profiles/graphical.nix +++ b/profiles/graphical.nix @@ -17,14 +17,14 @@ noto-fonts-cjk ]; - gtk = { - enable = true; - font.name = "Victor Mono SemiBold 12"; - theme = { - name = "SolArc-Dark"; - package = pkgs.solarc-gtk-theme; - }; - }; + # gtk = { + # enable = true; + # font.name = "Victor Mono SemiBold 12"; + # theme = { + # name = "SolArc-Dark"; + # package = pkgs.solarc-gtk-theme; + # }; + # }; # gtk = { # theme.package = pkgs.gnome.gnome-themes-extra; -- cgit 1.4.1 From a01a6fbdfcf923b1c9fa55c7bec0617c230e8e67 Mon Sep 17 00:00:00 2001 From: tzlil Date: Tue, 16 May 2023 22:55:43 +0300 Subject: formatted, update flake inputs, add xdg fixes, fix foot colors, change terminal to footclient --- flake.lock | 92 ++++++++++++++++++++++++++++------------------------ hosts/laptop/cfg.nix | 9 ----- hosts/pc/cfg.nix | 9 ----- hosts/vm/cfg.nix | 6 ---- hosts/vps/cfg.nix | 8 ----- mixins/cli.nix | 2 +- mixins/sway.nix | 27 +++++++++++++-- profiles/core.nix | 11 +++++++ 8 files changed, 85 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index e14e6ef..a9f34c1 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,15 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1677969766, - "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", + "lastModified": 1684153753, + "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", "owner": "ryantm", "repo": "agenix", - "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", + "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", "type": "github" }, "original": { @@ -43,11 +44,11 @@ }, "hardware": { "locked": { - "lastModified": 1680070330, - "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=", + "lastModified": 1684169666, + "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421", + "rev": "71ce85372a614d418d5e303dd5702a79d1545c04", "type": "github" }, "original": { @@ -59,16 +60,36 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" - ], - "utils": "utils" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1680249941, - "narHash": "sha256-7Ylr0NAr8msd3YVaYBw6uyJIRbtOq5l6aLrmrYA5qTw=", + "lastModified": 1684189380, + "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", "owner": "nix-community", "repo": "home-manager", - "rev": "67b97020b6970d39b4126a7870063d11337ecb80", + "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", "type": "github" }, "original": { @@ -79,11 +100,11 @@ }, "impermanence": { "locked": { - "lastModified": 1675359654, - "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", + "lastModified": 1684264534, + "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", + "rev": "89253fb1518063556edd5e54509c30ac3089d5e6", "type": "github" }, "original": { @@ -144,11 +165,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1680125544, - "narHash": "sha256-mlqo1r+TZUOuypWdrZHluxWL+E5WzXlUXNZ9Y0WLDFU=", + "lastModified": 1684215771, + "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658", + "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", "type": "github" }, "original": { @@ -163,14 +184,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { - "lastModified": 1680261737, - "narHash": "sha256-tJDA4yMBkDESIFyGKKjUObg3UcnGvpdPdnbuK9hDtR4=", + "lastModified": 1684255366, + "narHash": "sha256-kgG8wwnypHYMUAUOjjwH22xJdo5d7SbbrtzArnkGbww=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "fd509bb8400249dc5370068183b86b31a4aacd60", + "rev": "1be5a6ed07b69ff5115d6b0a23133e892d5d216b", "type": "github" }, "original": { @@ -183,7 +204,7 @@ "inputs": { "agenix": "agenix", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "impermanence": "impermanence", "nixinate": "nixinate", "nixpkgs": "nixpkgs_3", @@ -193,26 +214,11 @@ }, "utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -228,11 +234,11 @@ ] }, "locked": { - "lastModified": 1683889296, - "narHash": "sha256-prMdngiMTbrHCBMY4ZFXmoGqb5FW/jaLL6RbAqtiUv8=", + "lastModified": 1684262161, + "narHash": "sha256-SVGl2skgiJj4hqIuhO3pkJOIPGv8A1R8ySmG2WuqXg4=", "owner": "viperML", "repo": "nix-common", - "rev": "1998388936cd743cf09461a52602a0ce211da0eb", + "rev": "2920c1913ccca1596d83a80b46af5fe8452f74e8", "type": "github" }, "original": { diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix index 530ac34..c624732 100644 --- a/hosts/laptop/cfg.nix +++ b/hosts/laptop/cfg.nix @@ -40,15 +40,6 @@ supportedFilesystems = ["ntfs"]; kernelModules = ["kvm-intel"]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - kernelParams = [ - "console=ttyS0" - "init_on_free=1" - "page_poison=1" - "page_alloc.shuffle=1" - "slab_nomerge" - "vsyscall=none" - ]; - cleanTmpDir = true; loader = { systemd-boot = { enable = true; diff --git a/hosts/pc/cfg.nix b/hosts/pc/cfg.nix index 38fb8c6..ee3b716 100644 --- a/hosts/pc/cfg.nix +++ b/hosts/pc/cfg.nix @@ -33,15 +33,6 @@ }; kernelModules = ["kvm-amd"]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - kernelParams = [ - "console=ttyS0" - "init_on_free=1" - "page_poison=1" - "page_alloc.shuffle=1" - "slab_nomerge" - "vsyscall=none" - ]; - cleanTmpDir = true; loader = { systemd-boot = { enable = true; diff --git a/hosts/vm/cfg.nix b/hosts/vm/cfg.nix index 79f00c4..99ed8b9 100644 --- a/hosts/vm/cfg.nix +++ b/hosts/vm/cfg.nix @@ -42,13 +42,7 @@ kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; kernelParams = [ "console=ttyS0" - "init_on_free=1" - "page_poison=1" - "page_alloc.shuffle=1" - "slab_nomerge" - "vsyscall=none" ]; - cleanTmpDir = true; loader = { systemd-boot = { enable = true; diff --git a/hosts/vps/cfg.nix b/hosts/vps/cfg.nix index f780229..2ec6cd4 100644 --- a/hosts/vps/cfg.nix +++ b/hosts/vps/cfg.nix @@ -29,14 +29,6 @@ boot = { kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - kernelParams = [ - "init_on_free=1" - "page_poison=1" - "page_alloc.shuffle=1" - "slab_nomerge" - "vsyscall=none" - ]; - cleanTmpDir = true; loader.grub.device = "/dev/vda"; initrd = { availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; diff --git a/mixins/cli.nix b/mixins/cli.nix index 84a5e3d..4137377 100644 --- a/mixins/cli.nix +++ b/mixins/cli.nix @@ -13,7 +13,7 @@ ... }: { imports = [ - # inputs.viper-nix-common.homeModules.xdg + inputs.viper-nix-common.homeModules.xdg ]; home = { packages = with pkgs; [ diff --git a/mixins/sway.nix b/mixins/sway.nix index 8917ffe..8143e6b 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -17,7 +17,7 @@ app_id=menu chooser="${pkgs.fzf}/bin/fzf <$in_pipe >$out_pipe" - ${pkgs.foot}/bin/foot -W40x40 --app-id "$app_id" -- sh -c "$chooser" & + ${pkgs.foot}/bin/footclient -W40x40 --app-id "$app_id" -- sh -c "$chooser" & cat >"$in_pipe" cat <"$out_pipe" ''; @@ -75,10 +75,31 @@ in { wf-recorder font-awesome_6 waypipe - foot alsa-utils ]; + programs.foot = { + enable = true; + server.enable = true; + settings = { + # main = { + # term = "xterm-256color"; + + # font = "Fira Code:size=11"; + # dpi-aware = "yes"; + # }; + + colors = { + background = "000000"; + foreground = "ffffff"; + }; + + # mouse = { + # hide-when-typing = "yes"; + # }; + }; + }; + services.swayidle = let pgrep = "${pkgs.procps}/bin/pgrep"; dpms_check = s: @@ -246,7 +267,7 @@ in { set $down n set $up e set $right i - set $term ${pkgs.foot}/bin/foot + set $term ${pkgs.foot}/bin/footclient default_border pixel hide_edge_borders smart diff --git a/profiles/core.nix b/profiles/core.nix index 5f29653..f81ead8 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -32,5 +32,16 @@ # save uid/guid environment.persistence."/nix/persist".directories = ["/var/lib/nixos"]; + + boot = { + tmp.cleanOnBoot = true; + kernelParams = [ + "init_on_free=1" + "page_poison=1" + "page_alloc.shuffle=1" + "slab_nomerge" + "vsyscall=none" + ]; + }; }; } -- cgit 1.4.1