diff --git a/home-manager/dotfiles/bash/.bashrc b/home-manager/dotfiles/bash/.bashrc index 9b358ec..6f2d213 100644 --- a/home-manager/dotfiles/bash/.bashrc +++ b/home-manager/dotfiles/bash/.bashrc @@ -1,11 +1,8 @@ -kittysay "meow, what r we doin 2day :3" +alias gocode="cd ~/Documents/Code/" + +kittysay meow eval "$(zoxide init bash)" eval "$(direnv hook bash)" # nnn configuration NNN_PLUG='L:nmount' - -BLUE="\x01[$(tput setaf 12)\x02]" -RESET="\x01[$(tput setaf 15)\x02]" - -# PS1='\n${BLUE}󱄅 ${RESET}:\h \n\u@\h$ ' \ No newline at end of file diff --git a/home-manager/dotfiles/hyfetch/hyfetch.json b/home-manager/dotfiles/hyfetch/hyfetch.json deleted file mode 100644 index a7bde25..0000000 --- a/home-manager/dotfiles/hyfetch/hyfetch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "preset": "genderfluid", - "mode": "rgb", - "light_dark": "dark", - "lightness": 0.81, - "color_align": { - "mode": "horizontal", - "custom_colors": [], - "fore_back": null - }, - "backend": "neofetch", - "args": null, - "distro": null, - "pride_month_shown": [], - "pride_month_disable": false -} \ No newline at end of file diff --git a/home-manager/dotfiles/sway/config b/home-manager/dotfiles/sway/config index addaf5a..3479b5a 100755 --- a/home-manager/dotfiles/sway/config +++ b/home-manager/dotfiles/sway/config @@ -29,7 +29,7 @@ set $screenshot_folder ~/Images/Captures\ d\'écrans/ ### Output configuration # # Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) -output * bg wallpapers/lain_1.jpg fill +output * bg wallpapers/wipeout_1.jpg fill # # Example configuration: # @@ -41,10 +41,11 @@ output * bg wallpapers/lain_1.jpg fill # # Example configuration: # -exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ - timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ - before-sleep 'swaylock -f -c 000000' +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' # # This will lock your screen after 300 seconds of inactivity, then turn off # your displays after another 300 seconds, and turn your screens back on when @@ -228,6 +229,7 @@ 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 diff --git a/home-manager/dotfiles/sway/scripts/wallpapers.sh b/home-manager/dotfiles/sway/scripts/wallpapers.sh deleted file mode 100644 index e69de29..0000000 diff --git a/home-manager/dotfiles/sway/wallpapers/lain_1.jpg b/home-manager/dotfiles/sway/wallpapers/lain_1.jpg deleted file mode 100644 index a7e2087..0000000 Binary files a/home-manager/dotfiles/sway/wallpapers/lain_1.jpg and /dev/null differ diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index 9832293..40d2e80 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -1,8 +1,8 @@ { "layer": "top", - "modules-left": ["custom/launcher", "sway/workspaces", "sway/mode"], + "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": [], - "modules-right": ["tray", "bluetooth", "network", "clock", "privacy"], + "modules-right": ["wireplumber", "bluetooth", "network", "clock", "privacy"], "clock": { "format-alt": "{:%a, %d. %b %H:%M}" }, @@ -40,7 +40,7 @@ "network": { "interface": "wlp3s0", "format": "{ifname}", - "format-wifi": "", + "format-wifi": " ", "format-ethernet": "󰈀", "format-disconnected": "", //An empty format will hide the module. "tooltip-format": "{ifname} via {gwaddr} 󰈀", @@ -50,7 +50,7 @@ "max-length": 50 }, "bluetooth": { - "format": "", + "format": "", "format-disabled": "", "format-connected": "" }, @@ -74,7 +74,5 @@ "on-click": "swaync-client -t -sw", "on-click-right": "swaync-client -d -sw", "escape": true - }, - "custom/launcher": {}, - "custom/controlpanel": {} + } } diff --git a/home-manager/dotfiles/waybar/style.css b/home-manager/dotfiles/waybar/style.css index f01c713..e39b21d 100644 --- a/home-manager/dotfiles/waybar/style.css +++ b/home-manager/dotfiles/waybar/style.css @@ -1,25 +1,19 @@ @define-color primary rgba(123, 0, 44, 1); * { - padding: 0; - border-radius: 0; - min-height: 0; - margin: 0; - border: none; - text-shadow: none; - transition: none; - box-shadow: none; - font-family: "DM Sans", "CodeNewRoman Nerd Font", sans-serif; + font-family: "CodeNewRoman Nerd Font"; font-weight: bold; font-size: 12px; color: #000; } window#waybar { + margin: 12px 24px; background-color: #fff; - /*border: solid 2px @primary;*/ + border: solid 2px @primary; 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, @@ -30,19 +24,9 @@ window#waybar { padding: 0 12px; } -#workspaces button { - border-radius: 0; -} - -#workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; -} - #workspaces button.focused { - background-color: #000; - color: #fff !important; } #workspaces { + padding: 4px 0; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 4fd71b7..6203e71 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -33,7 +33,6 @@ # # fonts? (pkgs.nerdfonts.override { fonts = [ "CodeNewRoman" ]; }) - pkgs.dm-sans pkgs.zoxide pkgs.btop #pkgs.bitwarden @@ -100,7 +99,6 @@ ".config/waybar".source = dotfiles/waybar; ".config/cava".source = dotfiles/cava; ".bashrc".source = dotfiles/bash/.bashrc; - ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json; # # You can also set the file content immediately. # ".gradle/gradle.properties".text = '' diff --git a/hosts/goober/features/software/default.nix b/hosts/goober/features/software/default.nix index f69c5e0..cce31b4 100644 --- a/hosts/goober/features/software/default.nix +++ b/hosts/goober/features/software/default.nix @@ -6,7 +6,6 @@ ./neovim.nix ./flatpak.nix ./discord.nix - ./ollama.nix ]; } diff --git a/hosts/goober/features/software/ollama.nix b/hosts/goober/features/software/ollama.nix deleted file mode 100644 index ba252c0..0000000 --- a/hosts/goober/features/software/ollama.nix +++ /dev/null @@ -1,9 +0,0 @@ -{config, pkgs, ...}: -{ -services.ollama = { - enable = true; - # Optional: load models on startup - loadModels = [ "deepseek-r1:8b" ]; - acceleration = "cuda"; -}; -} \ No newline at end of file diff --git a/hosts/goober/features/software/wine.nix b/hosts/goober/features/software/wine.nix index 7e2c40c..4eeec14 100644 --- a/hosts/goober/features/software/wine.nix +++ b/hosts/goober/features/software/wine.nix @@ -23,8 +23,5 @@ # native wayland support (unstable) wineWowPackages.waylandFull - - # for easy games gestion - lutris ]; }