more style related changes

This commit is contained in:
Harry 2025-01-25 13:18:45 +01:00
parent 1de2a5aa0a
commit 5da82a8e80
12 changed files with 170 additions and 110 deletions
features/client
flake.lock
home-manager/dotfiles
hosts/goober/features/software
packages

View file

@ -6,6 +6,8 @@
wl-clipboard
xdg-utils
sway-contrib.grimshot
swaylock
swaynotificationcenter
];
services.gnome.gnome-keyring.enable = true;

View file

@ -277,11 +277,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1737614530,
"narHash": "sha256-s5+trj2UfrIWlrCm+hKDB5+36kY5scH9MxM9zfU+4qc=",
"lastModified": 1737701591,
"narHash": "sha256-S71nENrb8kBrEvihDD+1mzn5sRrRr1sAaNMkjWDx1h0=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "7d9aaf2f175602b8511e4c5134c4a975628c6948",
"rev": "c9248eec123e70ef1132bbedeae22e2af7011095",
"type": "github"
},
"original": {
@ -293,11 +293,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1737560784,
"narHash": "sha256-bW3ub7hI5Ml+4cFErZvlbbQNDmmycoroRYYAegj33qo=",
"lastModified": 1737675744,
"narHash": "sha256-2Q4SNciK6DHC5WknFSbk3aYjorayf9y4uz3tdtl/T1M=",
"owner": "neovim",
"repo": "neovim",
"rev": "af0ef2ac9dd19b7c4005a3197334d3e7d554646c",
"rev": "8bc28978b632362ae658f8d4a6327e07a8b371b2",
"type": "github"
},
"original": {
@ -396,11 +396,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1737525964,
"narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
"lastModified": 1737557748,
"narHash": "sha256-BaMuhctP1x00+8cBE2cJveJQb70/tWHI50MHj/ZrtOY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
"rev": "606996d74f6e2a12635d41c1bf58bfc7ea3bb5ec",
"type": "github"
},
"original": {
@ -412,11 +412,11 @@
},
"nixpkgsSmall": {
"locked": {
"lastModified": 1737624615,
"narHash": "sha256-LS94mLWVwLvHQEqXlxO9hQYbgUccoy33o7NsB/nFr6A=",
"lastModified": 1737672001,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d075248e4db179dd0b4fecf80c1aaa1de8954ddc",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github"
},
"original": {
@ -428,11 +428,11 @@
},
"nixpkgsUnstable": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github"
},
"original": {
@ -444,11 +444,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1737569578,
"narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
"lastModified": 1737672001,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "47addd76727f42d351590c905d9d1905ca895b82",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github"
},
"original": {

View file

@ -85,7 +85,7 @@ blink=yes
[colors]
# alpha=1.0
# background=242424
background=20111b
# foreground=ffffff
# flash=7f7f00
# flash-alpha=0.5

View file

@ -73,78 +73,78 @@ input * {
#
# Basics:
#
# Start a terminal
bindsym $mod+Return exec $term
# Start a terminal
bindsym $mod+Return exec $term
# Kill focused window
bindsym $mod+Shift+q kill
# Kill focused window
bindsym $mod+Shift+q kill
# Start your launcher
bindsym $mod+d exec $menu
# Start your launcher
bindsym $mod+d 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
# 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
# Reload the configuration file
bindsym $mod+Shift+c reload
# Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
# Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' '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
# Or use $mod+[up|down|left|right]
bindsym $mod+Left focus left
bindsym $mod+Down focus down
bindsym $mod+Up focus up
bindsym $mod+Right focus right
# Move your focus around
bindsym $mod+$left focus left
bindsym $mod+$down focus down
bindsym $mod+$up focus up
bindsym $mod+$right focus right
# Or use $mod+[up|down|left|right]
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
# Ditto, with arrow keys
bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move 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
# Ditto, with arrow keys
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+ampersand workspace 1
bindsym $mod+eacute workspace 2
bindsym $mod+quotedbl workspace 3
bindsym $mod+apostrophe workspace 4
bindsym $mod+parenleft workspace 5
bindsym $mod+minus workspace 6
bindsym $mod+egrave workspace 7
bindsym $mod+underscore workspace 8
bindsym $mod+ccedilla workspace 9
bindsym $mod+agrave workspace 10
# Move focused container to workspace
bindsym $mod+1 move container to workspace number 1
bindsym $mod+2 move container to workspace number 2
bindsym $mod+3 move container to workspace number 3
bindsym $mod+4 move container to workspace number 4
bindsym $mod+5 move container to workspace number 5
bindsym $mod+6 move container to workspace number 6
bindsym $mod+7 move container to workspace number 7
bindsym $mod+8 move container to workspace number 8
bindsym $mod+9 move container to workspace number 9
bindsym $mod+0 move container to workspace number 10
# Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default.
# Switch to workspace
bindsym $mod+ampersand workspace 1
bindsym $mod+eacute workspace 2
bindsym $mod+quotedbl workspace 3
bindsym $mod+apostrophe workspace 4
bindsym $mod+parenleft workspace 5
bindsym $mod+minus workspace 6
bindsym $mod+egrave workspace 7
bindsym $mod+underscore workspace 8
bindsym $mod+ccedilla workspace 9
bindsym $mod+agrave workspace 10
# Move focused container to workspace
bindsym $mod+1 move container to workspace number 1
bindsym $mod+2 move container to workspace number 2
bindsym $mod+3 move container to workspace number 3
bindsym $mod+4 move container to workspace number 4
bindsym $mod+5 move container to workspace number 5
bindsym $mod+6 move container to workspace number 6
bindsym $mod+7 move container to workspace number 7
bindsym $mod+8 move container to workspace number 8
bindsym $mod+9 move container to workspace number 9
bindsym $mod+0 move container to workspace number 10
# Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default.
#
# Layout stuff:
#
@ -173,18 +173,18 @@ input * {
#
# Scratchpad:
#
# Sway has a "scratchpad", which is a bag of holding for windows.
# You can send windows there and get them back later.
# 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
# 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
# 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
# useful shortcuts
bindsym Print exec ~/.config/sway/screen_and_copy.sh area
bindsym Ctrl+Print exec ~/.config/sway/screen_and_copy.sh output
bindsym Print exec ~/.config/sway/scripts/screen_and_copy.sh area
bindsym Ctrl+Print exec ~/.config/sway/scripts/screen_and_copy.sh output
bindsym --locked XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
bindsym --locked XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1.2
bindsym --locked XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.2
@ -227,3 +227,15 @@ bar {
seat seat0 xcursor_theme "miku-cursor-linux" 36
include /etc/sway/config.d/*
# enable numlock on start
input type:keyboard xkb_capslock enabled
input type:keyboard xkb_numlock enabled
# floating bitwarden
for_window [app_id="^firefox$" title="^Extension: \(Bitwarden - Free Password Manager\) - Bitwarden — Mozilla Firefox$"] floating enable
# notification daemon
exec swaync
bindsym $mod+Shift+n exec swaync-client -t -sw

View file

Before

(image error) Size: 420 KiB

After

(image error) Size: 420 KiB

View file

@ -1,16 +1,23 @@
{
"layer": "top",
"modules-left": ["sway/workspaces", "sway/mode"],
"modules-center": [ ],
"modules-right": ["mpris", "wireplumber","cpu", "bluetooth", "network", "clock", "privacy"],
"modules-center": [],
"modules-right": [
"wireplumber",
"cpu",
"bluetooth",
"network",
"clock",
"privacy"
],
"clock": {
"format-alt": "{:%a, %d. %b %H:%M}"
"format-alt": "{:%a, %d. %b %H:%M}"
},
"wireplumber": {
"format": "{volume}% ",
"format-muted": "",
"max-volume": 120,
"scroll-step": 0.2
"format": "{volume}% ",
"format-muted": "",
"max-volume": 120,
"scroll-step": 0.2
},
"privacy": {
"icon-spacing": 4,
@ -40,19 +47,39 @@
"network": {
"interface": "wlp3s0",
"format": "{ifname}",
"format-wifi": "{essid} ({signalStrength}%)  ",
"format-ethernet": "{ipaddr}/{cidr} 󰊗",
"format-wifi": " ",
"format-ethernet": "󰈀",
"format-disconnected": "", //An empty format will hide the module.
"tooltip-format": "{ifname} via {gwaddr} 󰊗",
"tooltip-format": "{ifname} via {gwaddr} 󰈀",
"tooltip-format-wifi": "{essid} ({signalStrength}%)  ",
"tooltip-format-ethernet": "{ifname}  ",
"tooltip-format-disconnected": "Disconnected",
"max-length": 50
},
},
"bluetooth": {
"format": "",
"format-disabled": "",
"format-connected": ""
}
},
"custom/notification": {
"tooltip": false,
"format": "{} {icon}",
"format-icons": {
"notification": "<span foreground='red'><sup></sup></span>",
"none": "",
"dnd-notification": "<span foreground='red'><sup></sup></span>",
"dnd-none": "",
"inhibited-notification": "<span foreground='red'><sup></sup></span>",
"inhibited-none": "",
"dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": ""
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
}
}

View file

@ -1,3 +1,7 @@
:root {
--primary-color: #7b002c;
}
* {
font-family: "CodeNewRoman Nerd Font";
font-weight: bold;
@ -6,24 +10,27 @@
}
window#waybar {
margin: 12px 24px;
background-color: #fff;
border: solid 2px var(--primary-color);
min-height: 14px; /* set waybar's height to 14px */
font-size: 14px; /* set only the font size to be bigger, which in turn will adjust the height of other elements */
border-radius: 12px;
}
#clock, #battery, #cpu, #wireplumber, #bluetooth {
#clock,
#battery,
#cpu,
#wireplumber,
#bluetooth {
padding: 0 12px;
}
#workspaces button.focused {
border-bottom: solid 2px #7b002c;
border-radius: 0;
border-bottom: solid 2px var(--primary-color);
border-radius: 0;
}
#workspaces {
padding: 4px 0;
}
window#waybar {
min-height: 14px; /* set waybar's height to 18px */
font-size: 14px; /* set only the font size to be bigger, which in turn will adjust the height of other elements */
}

View file

@ -7,4 +7,5 @@
./flatpak.nix
./discord.nix
];
}

View file

@ -4,4 +4,6 @@
quickemu
qemu
];
systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
}

View file

@ -10,9 +10,18 @@ stdenv.mkDerivation {
hash = "sha256-OQjjOc9VnxJ7tWNmpHIMzNWX6WsavAOkgPwK1XAMwtE=";
};
postInstall = ''
installPhase = ''
runHook preInstall
cd miku-cursor-linux
mkdir -p $out/share/icons/miku-cursor-linux
cp -r * $out/share/icons/miku-cursor-linux
install -m644 index.theme $out/share/icons/miku-cursor-linux/index.theme
runHook postInstall
'';
}