From 6b2377ac1097521080f2fdc445122b12e5e1a27e Mon Sep 17 00:00:00 2001 From: Jade Date: Thu, 1 Dec 2022 18:26:43 +0100 Subject: [PATCH] meow --- flake.lock | 231 +++++++++++++++++++++++++++++++++ modules/desktop.nix | 8 +- potatobook-g/configuration.nix | 31 +++++ 3 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a90ab81 --- /dev/null +++ b/flake.lock @@ -0,0 +1,231 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1669573161, + "narHash": "sha256-UAOXq+LIX+goAAY2MiC0+zCxdNPaO7NAPTvCQExpIBs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "50c9bccb6abc52811a59db620606e016fcde32bd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "mac-brcm-fw": { + "flake": false, + "locked": { + "lastModified": 1668279146, + "narHash": "sha256-KP2cgNVty0t+8laUc8nxefOk8O60fw/mBt7qStSyPNA=", + "path": "/home/jade/mac-brcm-fw", + "type": "path" + }, + "original": { + "path": "./mac-brcm-fw", + "type": "path" + } + }, + "mms": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nix": "nix", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1669478601, + "narHash": "sha256-IQcS8IPeXvSoIrQRPgtnLxAs0Pkh8wmglDAtqE4ivNo=", + "owner": "mkaito", + "repo": "nixos-modded-minecraft-servers", + "rev": "68f2066499c035fd81c9dacfea2f512d6b0b62e5", + "type": "github" + }, + "original": { + "owner": "mkaito", + "repo": "nixos-modded-minecraft-servers", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1669449054, + "narHash": "sha256-aCpXrNpyFH6b1NFYGj2i/HecUvz2vZ88aEyDs1Xj8yM=", + "owner": "NixOS", + "repo": "nix", + "rev": "534332c8a03b64161ec795d1deb2ba3d48f27be1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nix", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1669485734, + "narHash": "sha256-kxDN2G5IunZGAkmTJoaz0B7dduU1R7MHnmiHoZq7zis=", + "owner": "kekrby", + "repo": "nixos-hardware", + "rev": "1e2e5a5749a1a6709f5858f208f23ce43ce7064e", + "type": "github" + }, + "original": { + "owner": "kekrby", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1669378442, + "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1669535121, + "narHash": "sha256-koZLM7oWVGrjyHnYDo7/w5qlmUn9UZUKSFNfmIjueE8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b45ec953794bb07922f0468152ad1ebaf8a084b3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "mac-brcm-fw": "mac-brcm-fw", + "mms": "mms", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_3" + } + }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/desktop.nix b/modules/desktop.nix index 5116f91..eefec62 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -34,6 +34,7 @@ in with lib; { drawing # drwaing! libqalculate # needed by menu-qalc ddgr jq # needed by searchwolf + brillo # kb backlight # custom scripts window-screenshot desktop-ctl em-record em-play em-play-loop ocr-screenshot menu-qalc pc-get pc-set searchwolf @@ -149,6 +150,9 @@ in with lib; { "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; + "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; + "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; + # macros "${mod}+q" = "exec em-record.sh"; "${mod}+p" = "exec em-play.sh"; @@ -166,7 +170,7 @@ in with lib; { size = 9.0; }; gaps = { - top = 24; + #top = 24; inner = 15; outer = 0; smartGaps = false; @@ -276,7 +280,7 @@ in with lib; { cursor-scroll = "ns-resize"; enable-ipc = true; wm-restack = "i3"; - override-redirect = true; + override-redirect = false; }; "module/xworkspaces" = { diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index 21a9ed1..94d34d6 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -145,6 +145,37 @@ }; }; + networking = { + #nameservers = [ + #"192.168.8.205" + #]; + wireguard = { + enable = true; + interfaces = { + wg-maxim-vpn = { + privateKey = "CLcq8sCnusXz0jFHz6ODAZBD2Sn2vb9a5BCfbQGrrXk="; + listenPort = 21124; + ips = [ + "10.0.0.4/32" + ]; + peers = [ + { + allowedIPs = [ + "10.0.0.0/24" + "192.168.8.0/24" + #"0.0.0.0/0" + "::/0" + ]; + endpoint = "vpn.local.germannr4.com:51820"; + persistentKeepalive = 25; + publicKey = "coP4Hh1smQvVI52ftZFyPfmzvsKZcT/hHa8zHMrlZwE="; + } + ]; + }; + }; + }; + }; + #fileSystems."/swap" = { # device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62"; # fsType = "btrfs";