diff options
Diffstat (limited to '')
| -rw-r--r-- | config/git/default.nix | 2 | ||||
| -rw-r--r-- | config/labwc/config | 172 | ||||
| -rw-r--r-- | config/labwc/default.nix | 9 | ||||
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | machines/x/configuration.nix | 6 | ||||
| -rw-r--r-- | machines/x/home.nix | 15 | ||||
| -rw-r--r-- | modules/laptop.nix | 4 |
7 files changed, 24 insertions, 208 deletions
diff --git a/config/git/default.nix b/config/git/default.nix index a5109de..838af82 100644 --- a/config/git/default.nix +++ b/config/git/default.nix @@ -13,6 +13,7 @@ signoff = true; }; url = { + "git@github.com:" = { insteadOf = [ "gh:" @@ -26,6 +27,7 @@ "compromyse:" ]; }; + }; "filter \"lfs\"" = { diff --git a/config/labwc/config b/config/labwc/config deleted file mode 100644 index f9dfa5b..0000000 --- a/config/labwc/config +++ /dev/null @@ -1,172 +0,0 @@ -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term alacritty -# Your preferred application launcher -set $menu /config/dist/run.sh - -### Output configuration -# -output * bg /config/dist/wallpaper.png fill - -### Idle configuration -exec swayidle -w before-sleep 'swaylock -f' - -### Autostart -exec --no-startup-id autotiling-rs -exec --no-startup-id way-displays -exec --no-startup-id blueman-applet - -### Input configuration -input "1739:52865:DLL0C55:00_06CB:CE81_Touchpad" { - dwt enabled - tap enabled - natural_scroll enabled - middle_emulation enabled -} -# You can get the names of your inputs by running: swaymsg -t get_inputs - -### Key bindings -# Start a terminal -bindsym $mod+Shift+Return exec $term - -# Kill focused window -bindsym $mod+Shift+q kill - -# Start your launcher -bindsym $mod+space exec $menu - -# Drag floating windows by holding down $mod and left mouse button. -# Resize them with right mouse button + $mod. -# Despite the name, also works for non-floating windows. -# Change normal to inverse to use left mouse button for resizing and right -# mouse button for dragging. -floating_modifier $mod normal - -# Reload the configuration file -bindsym $mod+Shift+c reload - -# Exit sway (logs you out of your Wayland session) -bindsym $mod+Shift+b exec swaymsg exit -# -# Moving around: -# -# Move your focus around -bindsym $mod+$left focus left -bindsym $mod+$down focus down -bindsym $mod+$up focus up -bindsym $mod+$right focus right - -# Move the focused window with the same, but add Shift -bindsym $mod+Shift+$left move left -bindsym $mod+Shift+$down move down -bindsym $mod+Shift+$up move up -bindsym $mod+Shift+$right move right -# -# Workspaces: -# -# Switch to workspace -bindsym $mod+1 workspace number 1 -bindsym $mod+2 workspace number 2 -bindsym $mod+3 workspace number 3 -bindsym $mod+4 workspace number 4 -bindsym $mod+5 workspace number 5 -bindsym $mod+6 workspace number 6 -bindsym $mod+7 workspace number 7 -bindsym $mod+8 workspace number 8 -bindsym $mod+9 workspace number 9 -bindsym $mod+0 workspace number 10 -# Move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number 1 -bindsym $mod+Shift+2 move container to workspace number 2 -bindsym $mod+Shift+3 move container to workspace number 3 -bindsym $mod+Shift+4 move container to workspace number 4 -bindsym $mod+Shift+5 move container to workspace number 5 -bindsym $mod+Shift+6 move container to workspace number 6 -bindsym $mod+Shift+7 move container to workspace number 7 -bindsym $mod+Shift+8 move container to workspace number 8 -bindsym $mod+Shift+9 move container to workspace number 9 -bindsym $mod+Shift+0 move container to workspace number 10 -# -# Layout stuff: -# -# Switch the current container between different layout styles -bindsym $mod+w layout tabbed - -# Make the current focus fullscreen -bindsym $mod+f fullscreen - -# Toggle the current focus between tiling and floating mode -bindsym $mod+Shift+space floating toggle -# -# Scratchpad: -# -# Sway has a "scratchpad", which is a bag of holding for windows. -# You can send windows there and get them back later. - -# Move the currently focused window to the scratchpad -bindsym $mod+Shift+minus move scratchpad - -# Show the next scratchpad window or hide the focused scratchpad window. -# If there are multiple scratchpad windows, this command cycles through them. -bindsym $mod+minus scratchpad show -# -# Resizing containers: -# -mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" -# -# Utilities: -# -# Special keys to adjust volume via PulseAudio -bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle -bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% -bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% -bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle -# Special keys to adjust brightness via brightnessctl -bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- -bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ -# Special key to take a screenshot with grim -bindsym Print exec grim -g "$(slurp)" - | wl-copy - -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - position top - - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - status_command while /config/dist/bar.sh; do sleep 1; done - - colors { - statusline #607767 - background #0f1212 - active_workspace #000000 #607767 #0f1212 - focused_workspace #000000 #607767 #0f1212 - inactive_workspace #000000 #0f1212 #607767 - } -} - -include @sysconfdir@/sway/config.d/* diff --git a/config/labwc/default.nix b/config/labwc/default.nix deleted file mode 100644 index 94daed4..0000000 --- a/config/labwc/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ home, pkgs, ... }: - -{ - home.packages = with pkgs; [ - labwc - ]; - - # home.file.".config/sway/config".source = ./config; -} @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1749089136, + "narHash": "sha256-A1UgwtAEQYd38Z6VoRAiGs4jZQczAGyP5DF3hhYUdpg=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "a4f7deb49f7336feb6c5abaf213b374936421dbe", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748391243, - "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "lastModified": 1749062139, + "narHash": "sha256-gGGLujmeWU+ZjFzfMvFMI0hp9xONsSbm88187wJr82Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "rev": "86b95fc1ed2b9b04a451a08ccf13d78fb421859c", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748417666, - "narHash": "sha256-Sdkdv1HWNtoFH0oOTYT9xzkw6pHnj5e6E3+F3cCiJo8=", + "lastModified": 1749105456, + "narHash": "sha256-IRWCfw/01RE7Z4hHaV6xdTNa6QUYyG8RuuvSJsyF60c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879a3857072bdfc01869941540bbe50ca1f0a896", + "rev": "268bd33d0b302beba1fdc67fe511008fc974f6a6", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 03d806f..5137fef 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -28,11 +28,11 @@ in { "remapcapslock.nix" "login.nix" - # "plasma.nix" + "plasma.nix" # "mate.nix" # "xfce.nix" - "wm_utils.nix" - "polkit.nix" + # "wm_utils.nix" + # "polkit.nix" ]); boot.loader = { diff --git a/machines/x/home.nix b/machines/x/home.nix index cece0d7..cbface7 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -25,10 +25,8 @@ chromium spotify - postman obsidian - filezilla pcmanfm obs-studio @@ -37,8 +35,6 @@ git-lfs slides - - vscode ]; programs = { @@ -58,15 +54,14 @@ "emacs" "nvim" - "labwc" # "qtile" - # "plasma" + "plasma" # "sway" # "dwl.nix" - "themes.nix" - "way-displays" - "swaylock" - "dunst" + # "themes.nix" + # "way-displays" + # "swaylock" + # "dunst" "alacritty" # "spotify-player" diff --git a/modules/laptop.nix b/modules/laptop.nix index d4f9ff9..39719ae 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { - services.tlp = { + /* services.tlp = { enable = true; settings = { CPU_SCALING_GOVERNOR_ON_AC = "performance"; @@ -10,7 +10,7 @@ CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; }; - }; + }; */ boot = { kernelModules = [ "acpi_call" ]; |