From 7dd4cb58fe24ba353b8ed00ac3ffec0a08989631 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 11 Feb 2025 23:59:20 +0100 Subject: [PATCH] diesdas --- flake.lock | 24 ++++++++++++------------ flake.nix | 1 + home/default.nix | 2 ++ home/gnome/default.nix | 8 +++++++- home/gnome/run-or-raise.conf | 8 +++----- home/mail/default.nix | 4 ++-- system/default.nix | 2 ++ system/gnome.nix | 6 +++++- system/hyprland.nix | 17 +++++++++++++++++ system/plasma.nix | 4 ++-- 10 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 system/hyprland.nix diff --git a/flake.lock b/flake.lock index 687391e..4f5b153 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734616194, - "narHash": "sha256-J90ItNNG+V2tneyHGHDCTb/WBxrpobxl+SsiQGVxOAI=", + "lastModified": 1739229047, + "narHash": "sha256-sSTgA86wdk8d544c2+gzrfvVPHQF4mbsomvLOW2thn0=", "owner": "nix-community", "repo": "nur", - "rev": "89621e43228d2941138a4d54a24924cd70d12bfe", + "rev": "8348d89f30598a73fee7efb4b5d34c3de201e71b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3c1a1f..9eb3829 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix + ./system/hyprland.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/default.nix b/home/default.nix index f63ed39..1630d0a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,5 +48,7 @@ ]; programs.obs-studio.enable = true; + programs.kitty.enable = true; + } diff --git a/home/gnome/default.nix b/home/gnome/default.nix index d21b3c1..6a2eaf4 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -31,13 +31,16 @@ }; "org/gnome/settings-daemon/plugins/media-keys" = { screenreader = []; - magnifier = []; + magnifier = ["z"]; magnifier-zoom-in = []; magnifier-zoom-out = []; help = []; + logout = ["q"]; }; "org/gnome/shell/keybindings" = { toggle-quick-settings = ["comma"]; + toggle-message-tray = ["n"]; + toggle-overview = ["a"]; }; "org/gnome/desktop/wm/keybindings" = { move-to-monitor-down = []; @@ -47,6 +50,7 @@ move-to-workspace-last = []; switch-applications = ["Tab"]; switch-applications-backward = ["Tab"]; + switch-monitor = []; cycle-panels = []; cycle-panels-backward = []; cycle-group = []; @@ -84,6 +88,8 @@ switch-to-application-2 = []; switch-to-application-3 = []; switch-to-application-4 = []; + toggle-fullscreen = ["f"]; + begin-resize = ["r"]; }; }; xdg.configFile."run-or-raise/shortcuts.conf".source = ./run-or-raise.conf; diff --git a/home/gnome/run-or-raise.conf b/home/gnome/run-or-raise.conf index 2361354..783e5a5 100644 --- a/home/gnome/run-or-raise.conf +++ b/home/gnome/run-or-raise.conf @@ -14,12 +14,10 @@ # # This line cycles any open gnome-terminal (matched by wm_class = Gnome-terminal on Ubuntu 17.10) OR if not found, launches new one. # If you're using Arch, you may want to match by wm_class = gnome-terminal-server , just check yourself by Alt+F2/lg/Windows -t,gnome-terminal,gnome-terminal-server, -n,nautilus,, -f,firefox,, +b,firefox,, +f,nautilus,, return,foot,, -x,keepassxc,,, -q,qutebrowser,, +p,keepassxc,,, # You may use regular expression in title or wm_class. # Just put the regular expression between slashes. diff --git a/home/mail/default.nix b/home/mail/default.nix index 4898270..060cc3f 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -35,7 +35,7 @@ passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube"; signature = { text = '' - Dr. Till Straube (he, him, his) + Dr. Till Straube (he/him) Dept. of Human Geography Goethe University Frankfurt ''; @@ -88,7 +88,7 @@ notmuch.enable = true; userName = "till"; signature.text = '' - Till Straube (he, him, his) + Till Straube (he/him) PGP: https://keys.openpgp.org/search?q=till@ktiu.net ''; signature.showSignature = "append"; diff --git a/system/default.nix b/system/default.nix index db0d1ec..b30e810 100644 --- a/system/default.nix +++ b/system/default.nix @@ -12,6 +12,8 @@ programs.fish.enable = true; + users.mutableUsers = true; + users.users.till = { isNormalUser = true; description = "Till"; diff --git a/system/gnome.nix b/system/gnome.nix index 06799f8..2b2ae55 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -2,7 +2,11 @@ { services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager = { + gdm.enable = true; + autoLogin.user = "till"; + }; + services.xserver.desktopManager.gnome.enable = true; services.gnome.gnome-browser-connector.enable = true; environment.gnome.excludePackages = (with pkgs; [ diff --git a/system/hyprland.nix b/system/hyprland.nix new file mode 100644 index 0000000..af157b3 --- /dev/null +++ b/system/hyprland.nix @@ -0,0 +1,17 @@ +{ config, pkgs, ... }: + +{ + programs.uwsm.enable = true; + + programs.hyprland = { + enable = true; + withUWSM = true; + }; + + programs.waybar.enable = true; + + environment.systemPackages = with pkgs; [ + swaynotificationcenter + tofi + ]; +} diff --git a/system/plasma.nix b/system/plasma.nix index 6ebe62e..91ceacc 100644 --- a/system/plasma.nix +++ b/system/plasma.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: { - services.xserver.enable = true; - services.xserver.desktopManager.plasma6.enable = true; + services.xserver.enable = true; + services.xserver.desktopManager.plasma6.enable = true; }