diff --git a/.xinitrc b/.xinitrc index 7ba1585..1e8f15e 100755 --- a/.xinitrc +++ b/.xinitrc @@ -12,7 +12,7 @@ fi xrdb -merge ~/.Xresources setxkbmap -option caps:swapescape -feh --bg-scale ~/nix/wallpapers/inverted.png +feh --bg-scale ~/nix/wallpapers/blue.png dwmblocks & dunst & diff --git a/.xinitrc.laptop b/.xinitrc.laptop index 07d5d98..8d97148 100755 --- a/.xinitrc.laptop +++ b/.xinitrc.laptop @@ -12,7 +12,7 @@ fi xrdb -merge ~/.Xresources setxkbmap -option caps:swapescape -feh --bg-center ~/nix/wallpapers/inverted.png +feh --bg-center ~/nix/wallpapers/blue.png dwmblocks & dunst & diff --git a/config/base.nix b/config/base.nix index 2bd482b..46eaf50 100644 --- a/config/base.nix +++ b/config/base.nix @@ -22,7 +22,6 @@ nix.nixPath = ["/etc/nix/path"]; users.defaultUserShell = pkgs.bash; documentation.man.generateCaches = false; - # systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; programs.fish.enable = true; programs.bash = { interactiveShellInit = '' @@ -76,11 +75,8 @@ fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ - "ComicShannsMono" - "SourceCodePro" "Hack" "FiraCode" - "Iosevka" ]; }) ]; @@ -99,8 +95,6 @@ LC_TIME = "sv_SE.UTF-8"; }; - # boot.loader.systemd-boot.enable = true; - # boot.loader.efi.canTouchEfiVariables = true; boot.loader = { efi = { canTouchEfiVariables = false; @@ -121,15 +115,6 @@ nano git openssh - # ( - # catppuccin-sddm.override { - # flavor = "mocha"; - # font = "ComicShannsMono Nerd Font Bold"; - # fontSize = "17"; - # background = "${../wallpapers/inverted.png}"; - # loginBackground = true; - # } - # ) ]; diff --git a/config/home.nix b/config/home.nix index d6e3269..199dd51 100644 --- a/config/home.nix +++ b/config/home.nix @@ -15,7 +15,7 @@ ../shared/rofi.nix ../shared/kitty.nix ../shared/alacritty.nix - # ../shared/dunst.nix + ../shared/ranger.nix ../shared/tmux.nix ../shared/vim.nix ../shared/fish.nix @@ -24,26 +24,16 @@ ../shared/firefox.nix ../shared/zathura.nix ../shared/lazygit.nix - # ../shared/spotifyd.nix ../shared/ssh.nix ../shared/aerc.nix - ../shared/rbw.nix ../shared/oh-my-posh.nix - ../shared/mpv.nix ]; nixpkgs = { overlays = []; config = { - # allowUnfree = false; - # allowUnfreePredicate = _: false; allowUnfree = true; allowUnfreePredicate = _: true; - permittedInsecurePackages = [ - "electron-25.9.0" - "electron-19.1.9" - "nix-2.16.2" - ]; }; }; @@ -67,52 +57,46 @@ networkmanager fd bat - appimage-run bluez bluez-tools - betterlockscreen + unstable.betterlockscreen tmux - yt-dlp unstable.fzf eza btop + thttpd xcolor - beets openssl + dig + jq # Dev - tinygo - unstable.arduino-cli - conda - kaggle - unstable.cargo - unstable.rustc - cargo-generate + unstable.deno + unstable.hugo + unstable.logstash + ngrok + tailwindcss nodejs_22 - gleam gh-f gh yarn plantuml go - jq + dotnetCorePackages.sdk_8_0_3xx + templ + + #Tools qrencode + air + k9s git lazydocker - air - templ - ranger - tesseract4 - k9s kubectl - ngrok - zrok - graphviz - clang-tools #LSP + roslyn + roslyn-ls python312Packages.python-lsp-server - arduino-language-server yaml-language-server nil jdt-language-server @@ -128,15 +112,9 @@ gopls rust-analyzer - # Geography - geos - # UI - fooyin rofi-bluetooth pastel - unstable.rmpc - mpd imagemagick #VPN @@ -152,7 +130,7 @@ brightnessctl dunst - # Documentas + # Documents ripgrep grc texliveFull @@ -160,18 +138,16 @@ poppler_utils #Desktop - freecad - unstable.google-chrome + unstable.feishin firefox libreoffice unstable.signal-desktop - kompare pinta zathura vial thunderbird alacritty - neovim + unstable.neovim fastfetch lazygit byzanz @@ -180,7 +156,6 @@ # Utils speedcrunch - termusic #Unfree discord diff --git a/shared/fish.nix b/shared/fish.nix index 3266cfd..036c424 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -40,6 +40,7 @@ shellAbbrs = { homec="nvim ~/nix/config/home.nix"; n="eza -l --no-time --no-permissions --no-user"; + ls="eza -l --no-time --no-permissions --no-user"; dev="nix develop --command fish"; spot="steam-run ~/program/spotify_player"; sc="sc-im"; diff --git a/shared/kitty.nix b/shared/kitty.nix index 92e9c4c..d201ec8 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -5,12 +5,12 @@ font = if myhostname == "laptop" then { # name = "Iosevka Nerd Font Bold"; # name = "ComicShannsMono Nerd Font Bold"; - name = "Hack Nerd Font Bold"; - size = 20; + name = "Hack Nerd Font Mono Bold"; + size = 15; } else { # name = "Iosevka Nerd Font Bold"; # name = "ComicShannsMono Nerd Font Bold"; - name = "Hack Nerd Font Bold"; + name = "Hack Nerd Font Mono Bold"; size = 13; }; shellIntegration = { diff --git a/wallpapers/blue.png b/wallpapers/blue.png new file mode 100644 index 0000000..ce89e46 Binary files /dev/null and b/wallpapers/blue.png differ