aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/variables.nix2
-rw-r--r--home-manager/stvnliu/ags/config/config.js2
-rw-r--r--home-manager/stvnliu/home.nix34
-rw-r--r--home-manager/stvnliu/hypr/hyprland.nix10
-rw-r--r--home-manager/stvnliu/kanshi.nix49
-rw-r--r--home-manager/stvnliu/shells/fish/default.nix1
-rw-r--r--home-manager/stvnliu/shells/fish/init/tailscale.fish248
-rw-r--r--nixos/configuration.nix13
-rw-r--r--nixos/hardware-configuration.nix7
-rw-r--r--nixos/services/laptop.preset.nix1
-rw-r--r--nixos/services/misc.service.nix6
-rw-r--r--nixos/services/tailscale.service.nix10
12 files changed, 342 insertions, 41 deletions
diff --git a/common/variables.nix b/common/variables.nix
index a432d0e..b97ff23 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -21,7 +21,7 @@
config = rec {
myUserName = "stvnliu";
myHostName = "nixos-msi";
- displayScale = 1;
+ displayScale = 2;
myWallPaperPathString = "/home/${myUserName}/wallpaper.jpg";
myDisplayName = "Zhongheng Liu";
myEmail = "z.liu@outlook.com.gr";
diff --git a/home-manager/stvnliu/ags/config/config.js b/home-manager/stvnliu/ags/config/config.js
index ea1d86f..2197887 100644
--- a/home-manager/stvnliu/ags/config/config.js
+++ b/home-manager/stvnliu/ags/config/config.js
@@ -41,7 +41,7 @@ const Workspaces = () => Widget.EventBox({
function ClientTitle() {
return Widget.Label({
class_name: "client-title",
- label: hyprland.active.client.bind("title"),
+ label: hyprland.active.client.bind("title").as(title => title.length <= 30 ? title : `${title.substring(0, 29)}...`),
})
}
const WifiIndicator = () => Widget.Box({
diff --git a/home-manager/stvnliu/home.nix b/home-manager/stvnliu/home.nix
index ddbdbc0..6149715 100644
--- a/home-manager/stvnliu/home.nix
+++ b/home-manager/stvnliu/home.nix
@@ -69,7 +69,7 @@
tree
zed-editor
rhythmbox
- clash-verge-rev
+ #clash-verge-rev
qq
libreoffice
discord
@@ -86,9 +86,10 @@
mtpfs
teams-for-linux
sxiv
+ heroic
];
myAutostartCommands = [
- "${pkgs.clash-verge-rev}/bin/clash-verge"
+ #"${pkgs.clash-verge-rev}/bin/clash-verge"
"${pkgs.firefox}/bin/firefox"
"${pkgs.thunderbird}/bin/thunderbird"
];
@@ -121,35 +122,6 @@
};
# Nicely reload system units when changing configs
systemd.user.startServices = "sd-switch";
- services.kanshi = {
- enable = true;
- profiles = {
- undocked = {
- outputs = [
- {
- criteria = "eDP-1";
- scale = 1.0;
- status = "enable";
- }
- ];
- };
- docked_office_cn = {
- outputs = [
- {
- criteria = "AOC 2619 M1194JA002428";
- position = "0,0";
- mode = "1920x1200@59.94Hz";
- }
- {
- criteria = "eDP-1";
- position = "0,0";
- status = "disable";
- }
- ];
- };
- };
- systemdTarget = "hyprland-session.target";
- };
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
home.stateVersion = "24.05";
}
diff --git a/home-manager/stvnliu/hypr/hyprland.nix b/home-manager/stvnliu/hypr/hyprland.nix
index 8fedb7f..c7f4de2 100644
--- a/home-manager/stvnliu/hypr/hyprland.nix
+++ b/home-manager/stvnliu/hypr/hyprland.nix
@@ -9,12 +9,18 @@
enable = true;
# The hyprland package to use
package = pkgs.hyprland;
- plugins = with pkgs.hyprlandPlugins; [hyprfocus csgo-vulkan-fix];
+ plugins = with pkgs.hyprlandPlugins; [
+ hyprfocus
+ csgo-vulkan-fix
+ ];
# Whether to enable XWayland
xwayland.enable = true;
settings = {
xwayland = {force_zero_scaling = true;};
- monitor = ",preferred,auto,${builtins.toString config.displayScale}";
+ monitor = [
+ #"eDP-1, 1920x1080@165,0x0,1"
+ ",preferred, auto, ${builtins.toString config.displayScale}"
+ ];
input = {
# xset rate 250 50 replacement on wayland...
# FAST MODE LET'S GOOO
diff --git a/home-manager/stvnliu/kanshi.nix b/home-manager/stvnliu/kanshi.nix
new file mode 100644
index 0000000..ea86c62
--- /dev/null
+++ b/home-manager/stvnliu/kanshi.nix
@@ -0,0 +1,49 @@
+{
+ pkgs,
+ config,
+ ...
+}: {
+ services.kanshi = {
+ enable = true;
+ profiles = {
+ undocked = {
+ outputs = [
+ {
+ criteria = "eDP-1";
+ scale = 1.0;
+ status = "enable";
+ }
+ ];
+ };
+ docked_office_cn = {
+ outputs = [
+ {
+ criteria = "AOC 2619 M1194JA002428";
+ position = "0,0";
+ mode = "1920x1200@59.94Hz";
+ }
+ {
+ criteria = "eDP-1";
+ position = "0,0";
+ status = "disable";
+ }
+ ];
+ };
+ docked_office_gr = {
+ outputs = [
+ {
+ criteria = "HDMI-A-1";
+ position = "0,0";
+ mode = "1920x1080@60.00Hz";
+ }
+ {
+ criteria = "eDP-1";
+ position = "0,0";
+ status = "disable";
+ }
+ ];
+ };
+ };
+ systemdTarget = "hyprland-session.target";
+ };
+}
diff --git a/home-manager/stvnliu/shells/fish/default.nix b/home-manager/stvnliu/shells/fish/default.nix
index 895cc7f..c339bb0 100644
--- a/home-manager/stvnliu/shells/fish/default.nix
+++ b/home-manager/stvnliu/shells/fish/default.nix
@@ -16,6 +16,7 @@ in
shellInit = ''
${builtins.readFile ./init/zoxide.fish}
${builtins.readFile ./init/nh.fish}
+ ${builtins.readFile ./init/tailscale.fish}
function fish_greeting
${pkgs.fortune}/bin/fortune -a
end
diff --git a/home-manager/stvnliu/shells/fish/init/tailscale.fish b/home-manager/stvnliu/shells/fish/init/tailscale.fish
new file mode 100644
index 0000000..10af6b3
--- /dev/null
+++ b/home-manager/stvnliu/shells/fish/init/tailscale.fish
@@ -0,0 +1,248 @@
+# Copyright 2013-2023 The Cobra Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# fish completion for tailscale -*- shell-script -*-
+
+function __tailscale_debug
+ set -l file "$BASH_COMP_DEBUG_FILE"
+ if test -n "$file"
+ echo "$argv" >> $file
+ end
+end
+
+function __tailscale_perform_completion
+ __tailscale_debug "Starting __tailscale_perform_completion"
+
+ # Extract all args except the last one
+ set -l args (commandline -opc)
+ # Extract the last arg and escape it in case it is a space
+ set -l lastArg (string escape -- (commandline -ct))
+
+ __tailscale_debug "args: $args"
+ __tailscale_debug "last arg: $lastArg"
+
+ set -l requestComp "$args[1] completion __complete --descs=true --flags=true -- $args[2..-1] $lastArg"
+
+ __tailscale_debug "Calling $requestComp"
+ set -l results (eval $requestComp 2> /dev/null)
+
+ # Some programs may output extra empty lines after the directive.
+ # Let's ignore them or else it will break completion.
+ # Ref: https://github.com/spf13/cobra/issues/1279
+ for line in $results[-1..1]
+ if test (string trim -- $line) = ""
+ # Found an empty line, remove it
+ set results $results[1..-2]
+ else
+ # Found non-empty line, we have our proper output
+ break
+ end
+ end
+
+ set -l comps $results[1..-2]
+ set -l directiveLine $results[-1]
+
+ # For Fish, when completing a flag with an = (e.g., <program> -n=<TAB>)
+ # completions must be prefixed with the flag
+ set -l flagPrefix (string match -r -- '-.*=' "$lastArg")
+
+ __tailscale_debug "Comps: $comps"
+ __tailscale_debug "DirectiveLine: $directiveLine"
+ __tailscale_debug "flagPrefix: $flagPrefix"
+
+ for comp in $comps
+ printf "%s%s\n" "$flagPrefix" "$comp"
+ end
+
+ printf "%s\n" "$directiveLine"
+end
+
+# this function limits calls to __tailscale_perform_completion, by caching the result behind $__tailscale_perform_completion_once_result
+function __tailscale_perform_completion_once
+ __tailscale_debug "Starting __tailscale_perform_completion_once"
+
+ if test -n "$__tailscale_perform_completion_once_result"
+ __tailscale_debug "Seems like a valid result already exists, skipping __tailscale_perform_completion"
+ return 0
+ end
+
+ set --global __tailscale_perform_completion_once_result (__tailscale_perform_completion)
+ if test -z "$__tailscale_perform_completion_once_result"
+ __tailscale_debug "No completions, probably due to a failure"
+ return 1
+ end
+
+ __tailscale_debug "Performed completions and set __tailscale_perform_completion_once_result"
+ return 0
+end
+
+# this function is used to clear the $__tailscale_perform_completion_once_result variable after completions are run
+function __tailscale_clear_perform_completion_once_result
+ __tailscale_debug ""
+ __tailscale_debug "========= clearing previously set __tailscale_perform_completion_once_result variable =========="
+ set --erase __tailscale_perform_completion_once_result
+ __tailscale_debug "Successfully erased the variable __tailscale_perform_completion_once_result"
+end
+
+function __tailscale_requires_order_preservation
+ __tailscale_debug ""
+ __tailscale_debug "========= checking if order preservation is required =========="
+
+ __tailscale_perform_completion_once
+ if test -z "$__tailscale_perform_completion_once_result"
+ __tailscale_debug "Error determining if order preservation is required"
+ return 1
+ end
+
+ set -l directive (string sub --start 2 $__tailscale_perform_completion_once_result[-1])
+ __tailscale_debug "Directive is: $directive"
+
+ set -l shellCompDirectiveKeepOrder 32
+ set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2)
+ __tailscale_debug "Keeporder is: $keeporder"
+
+ if test $keeporder -ne 0
+ __tailscale_debug "This does require order preservation"
+ return 0
+ end
+
+ __tailscale_debug "This doesn't require order preservation"
+ return 1
+end
+
+
+# This function does two things:
+# - Obtain the completions and store them in the global __tailscale_comp_results
+# - Return false if file completion should be performed
+function __tailscale_prepare_completions
+ __tailscale_debug ""
+ __tailscale_debug "========= starting completion logic =========="
+
+ # Start fresh
+ set --erase __tailscale_comp_results
+
+ __tailscale_perform_completion_once
+ __tailscale_debug "Completion results: $__tailscale_perform_completion_once_result"
+
+ if test -z "$__tailscale_perform_completion_once_result"
+ __tailscale_debug "No completion, probably due to a failure"
+ # Might as well do file completion, in case it helps
+ return 1
+ end
+
+ set -l directive (string sub --start 2 $__tailscale_perform_completion_once_result[-1])
+ set --global __tailscale_comp_results $__tailscale_perform_completion_once_result[1..-2]
+
+ __tailscale_debug "Completions are: $__tailscale_comp_results"
+ __tailscale_debug "Directive is: $directive"
+
+ set -l shellCompDirectiveError 1
+ set -l shellCompDirectiveNoSpace 2
+ set -l shellCompDirectiveNoFileComp 4
+ set -l shellCompDirectiveFilterFileExt 8
+ set -l shellCompDirectiveFilterDirs 16
+
+ if test -z "$directive"
+ set directive 0
+ end
+
+ set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2)
+ if test $compErr -eq 1
+ __tailscale_debug "Received error directive: aborting."
+ # Might as well do file completion, in case it helps
+ return 1
+ end
+
+ set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2)
+ set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2)
+ if test $filefilter -eq 1; or test $dirfilter -eq 1
+ __tailscale_debug "File extension filtering or directory filtering not supported"
+ # Do full file completion instead
+ return 1
+ end
+
+ set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2)
+ set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2)
+
+ __tailscale_debug "nospace: $nospace, nofiles: $nofiles"
+
+ # If we want to prevent a space, or if file completion is NOT disabled,
+ # we need to count the number of valid completions.
+ # To do so, we will filter on prefix as the completions we have received
+ # may not already be filtered so as to allow fish to match on different
+ # criteria than the prefix.
+ if test $nospace -ne 0; or test $nofiles -eq 0
+ set -l prefix (commandline -t | string escape --style=regex)
+ __tailscale_debug "prefix: $prefix"
+
+ set -l completions (string match -r -- "^$prefix.*" $__tailscale_comp_results)
+ set --global __tailscale_comp_results $completions
+ __tailscale_debug "Filtered completions are: $__tailscale_comp_results"
+
+ # Important not to quote the variable for count to work
+ set -l numComps (count $__tailscale_comp_results)
+ __tailscale_debug "numComps: $numComps"
+
+ if test $numComps -eq 1; and test $nospace -ne 0
+ # We must first split on \t to get rid of the descriptions to be
+ # able to check what the actual completion will be.
+ # We don't need descriptions anyway since there is only a single
+ # real completion which the shell will expand immediately.
+ set -l split (string split --max 1 \t $__tailscale_comp_results[1])
+
+ # Fish won't add a space if the completion ends with any
+ # of the following characters: @=/:.,
+ set -l lastChar (string sub -s -1 -- $split)
+ if not string match -r -q "[@=/:.,]" -- "$lastChar"
+ # In other cases, to support the "nospace" directive we trick the shell
+ # by outputting an extra, longer completion.
+ __tailscale_debug "Adding second completion to perform nospace directive"
+ set --global __tailscale_comp_results $split[1] $split[1].
+ __tailscale_debug "Completions are now: $__tailscale_comp_results"
+ end
+ end
+
+ if test $numComps -eq 0; and test $nofiles -eq 0
+ # To be consistent with bash and zsh, we only trigger file
+ # completion when there are no other completions
+ __tailscale_debug "Requesting file completion"
+ return 1
+ end
+ end
+
+ return 0
+end
+
+# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves
+# so we can properly delete any completions provided by another script.
+# Only do this if the program can be found, or else fish may print some errors; besides,
+# the existing completions will only be loaded if the program can be found.
+if type -q "tailscale"
+ # The space after the program name is essential to trigger completion for the program
+ # and not completion of the program name itself.
+ # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish.
+ complete --do-complete "tailscale " > /dev/null 2>&1
+end
+
+# Remove any pre-existing completions for the program since we will be handling all of them.
+complete -c tailscale -e
+
+# this will get called after the two calls below and clear the $__tailscale_perform_completion_once_result global
+complete -c tailscale -n '__tailscale_clear_perform_completion_once_result'
+# The call to __tailscale_prepare_completions will setup __tailscale_comp_results
+# which provides the program's completion choices.
+# If this doesn't require order preservation, we don't use the -k flag
+complete -c tailscale -n 'not __tailscale_requires_order_preservation && __tailscale_prepare_completions' -f -a '$__tailscale_comp_results'
+# otherwise we use the -k flag
+complete -k -c tailscale -n '__tailscale_requires_order_preservation && __tailscale_prepare_completions' -f -a '$__tailscale_comp_results'
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 785228a..23387c9 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -46,7 +46,15 @@
};
};
};
-
+ xdg.portal = {
+ enable = true;
+ extraPortals = with pkgs; [
+ xdg-desktop-portal-gtk
+ ];
+ config = {
+ common.default = ["gtk"];
+ };
+ };
systemd.user.services.mpris-proxy = {
description = "Mpris proxy";
after = ["network.target" "sound.target"];
@@ -74,13 +82,14 @@
];
# turned off because timedatectl doesn't like it
time.hardwareClockInLocalTime = false;
+ time.timeZone = "Europe/Athens";
services = {
#displayManager.sddm = {
# enable = true;
# wayland.enable = true;
# theme = "${import ./sddm-theme.nix {inherit pkgs;}}";
#};
- automatic-timezoned.enable = true;
+ #automatic-timezoned.enable = true;
openssh = {
enable = true;
settings = {
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index 81b97e4..29eca17 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -12,7 +12,7 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
- boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod"];
+ boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
@@ -28,6 +28,11 @@
options = ["fmask=0022" "dmask=0022"];
};
+ fileSystems."/games" = {
+ device = "/dev/disk/by-uuid/492b4058-0507-456d-b694-a340222d35af";
+ fsType = "ext4";
+ };
+
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/nixos/services/laptop.preset.nix b/nixos/services/laptop.preset.nix
index 31d0137..5b61276 100644
--- a/nixos/services/laptop.preset.nix
+++ b/nixos/services/laptop.preset.nix
@@ -6,5 +6,6 @@
./misc.service.nix
./avahi.service.nix
./printing.service.nix
+ ./tailscale.service.nix
];
}
diff --git a/nixos/services/misc.service.nix b/nixos/services/misc.service.nix
index 72fcd2c..6a10eb0 100644
--- a/nixos/services/misc.service.nix
+++ b/nixos/services/misc.service.nix
@@ -1,7 +1,7 @@
{...}: {
- specialisation.powersave.configuration = {
- services.auto-cpufreq.enable = true;
- };
+ #specialisation.powersave.configuration = {
+ # services.auto-cpufreq.enable = true;
+ #};
services = {
upower.enable = true;
udisks2.enable = true;
diff --git a/nixos/services/tailscale.service.nix b/nixos/services/tailscale.service.nix
new file mode 100644
index 0000000..d0fbde1
--- /dev/null
+++ b/nixos/services/tailscale.service.nix
@@ -0,0 +1,10 @@
+{
+ pkgs,
+ config,
+ ...
+}: {
+ services.tailscale = {
+ enable = true;
+ useRoutingFeatures = "client";
+ };
+}
generated by cgit (git 2.34.1) at 2025-05-23 22:48:21 +0000