diff --git a/flake.lock b/flake.lock index ef35892..38c1ad0 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1678109311, - "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", + "lastModified": 1678271387, + "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", "owner": "nix-community", "repo": "home-manager", - "rev": "04d6cad67557512452decbfe888c68fa11338a96", + "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1678093429, - "narHash": "sha256-TDegkSVDSTwOi9j1tc84xiIctxYwgt4kBLfKu88cjlQ=", + "lastModified": 1678371846, + "narHash": "sha256-fOFX0PASpIpU4NK9Wen9yJKwg5RYe5jFIu1H0OUzglE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f647a8e8be78d3817f126e41940bef49e81232e", + "rev": "c9167d96467f0c1546f337828e874d7dd849f900", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1678095239, - "narHash": "sha256-4F6jovFJcwh6OkMsY94ZrHdrvVqZi1FX5pYv6V9LIQw=", + "lastModified": 1678350133, + "narHash": "sha256-sUxDtERkqq0oGU5eGtlem5zE5ga801yXfpc3XlPfC4k=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6610997b0fc5ea5f9e142c348fca27497efe1c7", + "rev": "6e303a505ad31a8e68a7f0d43e2170e81c16919b", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1678293141, + "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1678115176, - "narHash": "sha256-uQ16lon2tDtzwgpX0CmNus7//xvO+bV8iPvr2jKwOvE=", + "lastModified": 1678367030, + "narHash": "sha256-hiDPs0V7PwsBVYux2VSgExFOkeT9SSGpczRmxxQSOQ4=", "owner": "pta2002", "repo": "nixvim", - "rev": "2c333c86d08218af1bdcad39be58ee2bacd991fa", + "rev": "ecfa870c7a37fdc4c50ff4efc73faa42bc1b8660", "type": "github" }, "original": { @@ -394,11 +394,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1677987270, - "narHash": "sha256-NRqhY8jbrmP1C6oiVqv1T0T1r560eo4ZpmEdHoQmKj4=", + "lastModified": 1678264398, + "narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7cff56b43952edc5a2c212076d5fc922f764240f", + "rev": "00e9e9cd46600d68dd98a392025d4894c3711b58", "type": "github" }, "original": { diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index fa7a846..29ff79d 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -85,9 +85,8 @@ devmon.enable = true; # automount stuff printing = { enable = true; - #drivers = with pkgs; [ gutenprint gutenprint-bin ]; }; - avahi = { + avahi = { # autodiscover printers enable = true; nssmdns = true; }; @@ -147,7 +146,8 @@ python3 zip unzip - mupdf + nvme-cli + intel-gpu-tools ]; system.stateVersion = "22.11"; diff --git a/hosts/thinkpad/modules/networks/uni.nix b/hosts/thinkpad/modules/networks/uni.nix index 1ee57ea..3ea6089 100644 --- a/hosts/thinkpad/modules/networks/uni.nix +++ b/hosts/thinkpad/modules/networks/uni.nix @@ -31,6 +31,10 @@ psk = "@FSR_PSK@"; authProtocols = [ "WPA-PSK" ]; }; + "RoboLab Playground" = { + psk = "@ROBOLAB_PSK@"; + authProtocols = [ "WPA-PSK" ]; + }; }; openconnect.interfaces = { TUD-A-Tunnel = { diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml index aeba6f9..6f769b4 100644 --- a/secrets/thinkpad.yaml +++ b/secrets/thinkpad.yaml @@ -1,4 +1,4 @@ -wireless-env: ENC[AES256_GCM,data:BPRubHOwQfJxB6aKh35BDwGlP+0QE9YDSbLJ4jIIKmQGhtJ6S+Haoqr+68Siy+P7ZfISbMk6mEOvpoEl23eB5yODvbCrwhYeffZYPrKCsgLTF0R/KXiXwpHTPNma74n2b+c9/BXfAuoLDmNdV+6+Is3BAyhbjyRJPnJgAEXt+v8sBKsrbwZK0sZERwcQotwwKh5nmwQOyfNOaSnDOEegcC11O76/GwSBP7LC7NVVFUiyOieJjF9hvOoXRrag/A/DCu5INQoJ7g==,iv:uFIGvz7poAOMCcfSmh3dwyEH7o8H7HcDDwQEsRNBmN0=,tag:j9pEBS6onwslgQ4AlqvWZw==,type:str] +wireless-env: ENC[AES256_GCM,data:i4+LsCCN0vBwoZg2IV2d7N9wg5J6GrET0JR9XGGKBht/JLiTly974bsGxbOXou7P4APxo+nrot8nP2XtRlQZRGTp0nNMbG2vN6BDcDCCQtbaEKCJHhsrHT5mg2XldxvNc19/AOimP14KsXXSTuOXe0eqKSro8tlzOnUh6QpEUomUiovPq5xvD99TWqyXkSw0OAljLNdmjw/owHby/RnUzjctHFEohqJXRdhxoMAFYqNqZ4CTgZP80R9L0LB4hLRQpS7xZs60KRO89ENIYRDybVWiE5f4IIlYnJgHRo7gNOz0qao=,iv:jvcO8Al08LBadKWy4SdNynVAxx5hD1IexJQgv4tH0Ew=,tag:fRGF4xXfgADq9DyzS3eqiA==,type:str] uni: zih: ENC[AES256_GCM,data:KoiT/w5SsUEFAC5beCs3R5o=,iv:qQRZfdtbiAIWUAkdgrpdR8AWDdedn9yl9NcRm0ymE2A=,tag:uyhy5n40PgsWuaEofJjmog==,type:str] wireguard: @@ -20,8 +20,8 @@ sops: d1J5UHJDYjlZWEV1aEVDSmxhWDB0anMKMNzyd465AdMyX0o9NxF+hcLyROcd8xoJ 39K5xIDzcqpu6HfoZk1kZ/TT1DS2Xiw0rDuJHWdfpnS8zNe6DL3a7Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-02-25T23:26:47Z" - mac: ENC[AES256_GCM,data:nfRwekR/4/trVfZfo0PAPp9aW/9ETHnMYLruACC0JjSTLa6Bfs1nCLwu+ylVX2dPD9LIZZRa9aKKSkCRYJxnqIW/uCs+RMWn+FDq9Cg35tbyEUaBIkhFz09LsSLfZKodqBrVjOGgxgTFfzn075EU0nCho3PRpUesMdIpX9PhTfM=,iv:FJ+rAPTmNXDrAguUJScZnHJ3SOH6/Znx2Mliz+eoR2M=,tag:Fc3CGH9KaPchGH0i9VY1Wg==,type:str] + lastmodified: "2023-03-08T12:03:05Z" + mac: ENC[AES256_GCM,data:H+E5ll+r5ZxPuyA3npRjyOKE/bTowRM1JVGVEROfOqKuc0sKNFx0g5kCRISihKNcPvrM/PXJ3/xlGYKup+1SVf1EvM+3RZdfCVVgNt2WIzBrtEJfNMXvWiHi+IJZwelzcVzM6c1s2VSXRmpROoPJ28tms+uUyM9F15MNAFkgfg0=,iv:OK5PtLeBY3SziaXlSH9+u7ShQCgIQWHmJ2P2+TPMKFg=,tag:Ctu967eDmUqa8S1VXwsLkQ==,type:str] pgp: - created_at: "2023-02-16T20:53:51Z" enc: |- diff --git a/users/rouven/modules/git/default.nix b/users/rouven/modules/git/default.nix index 9924dbb..61442dd 100644 --- a/users/rouven/modules/git/default.nix +++ b/users/rouven/modules/git/default.nix @@ -4,7 +4,7 @@ programs.git = { enable = true; userName = "Rouven Seifert"; - userEmail = "rouven@rfive.de"; + userEmail = config.accounts.email.accounts."TU-Dresden".address; extraConfig = { core.pager = "delta"; interactive.diffFilter = "delta --color-only"; diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index 86ddcb3..83f119e 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -68,7 +68,7 @@ master { gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = on + workspace_swipe = off } misc { @@ -80,6 +80,7 @@ windowrulev2 = opacity 0.8 0.5, class:^.*$ windowrulev2 = opacity 1.0 0.5, class:^Alacritty$ windowrulev2 = opacity 1.0 0.5, class:^google-chrome$ windowrulev2 = opacity 1.0 1.0, class:^mpv$ +windowrulev2 = opacity 1.0 1.0, class:^Gimp-2.10$ windowrulev2 = opacity 1.0 1.0, fullscreen:1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index 57108a2..ac612b7 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -2,12 +2,12 @@ { home.packages = with pkgs; [ ripgrep + black ]; programs.nixvim = { enable = true; vimAlias = true; - colorscheme = "dracula"; - options = + colorscheme = "dracula"; options = { shiftwidth = 4; expandtab = false; @@ -97,6 +97,9 @@ pyright = { enable = true; }; + #pylsp = { + #enable = true; + #}; texlab = { enable = true; }; @@ -136,7 +139,7 @@ tree-sitter-markdown tree-sitter-nix tree-sitter-perl - tree-sitter-python + #tree-sitter-python # broken atm tree-sitter-regex tree-sitter-rst tree-sitter-rust diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index bb2daff..bbee51a 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -58,6 +58,8 @@ bat # better less duf # better df + jetbrains.pycharm-community # backup ide in case vim has a bad day again + powerline-fonts # libs diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix index ab24b09..e7b7733 100644 --- a/users/rouven/modules/ssh/default.nix +++ b/users/rouven/modules/ssh/default.nix @@ -3,6 +3,9 @@ programs.ssh = { enable = true; matchBlocks = { + "se-gitlab.inf.tu-dresden.de" = { + identityFile = "~/.ssh/git"; + }; "github.com" = { identityFile = "~/.ssh/git"; };