diff --git a/flake.lock b/flake.lock index 1306d9a..0133c4a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1614673811, - "narHash": "sha256-hO9pkXF9kIjI9p6dpOEF9eZrflpTMBaDYf+QCunfmfM=", + "lastModified": 1615028506, + "narHash": "sha256-OiRfJ81e/kDAtg6YOlaVbvXLZ6tbo2Av/SEC1qs4WnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d82c865b416354a43cb30bd1945c3bbda27850d", + "rev": "37b47da04ca50d17934881192e65ad2df83704b5", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1614805153, - "narHash": "sha256-VF5/8GEK+NLxoZDtPtAWPt+gKVZkSO5fQ9Bfp0K0j9Q=", + "lastModified": 1615419569, + "narHash": "sha256-+ewB0sQGeoYryWZk2Ww2Lm/5jeqhlYTjGy6zEX2Mm1I=", "owner": "nix-community", "repo": "home-manager", - "rev": "ddee030dc7b298f24e86e0e6ec9cc9117e7069be", + "rev": "040ea28e448a93d24540b7cf2eda4b25300c5ab1", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1614535430, - "narHash": "sha256-kZwi0CooIOmFrk9eIteYSZIr4a4DVTEYV7UnURs6DSM=", + "lastModified": 1615259932, + "narHash": "sha256-IXecmbqCr+XCtFwzBO3tHEd8PoJ4X4EyPZebKbV2ioE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aeba64fb26e4defa0842a942757144659c6e29f", + "rev": "29b0d4d0b600f8f5dd0b86e3362a33d4181938f9", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1614805419, - "narHash": "sha256-3bxvjQcrPksJw4h9/WEjuHQakn81G4CHhlzPArk1V5I=", + "lastModified": 1615122150, + "narHash": "sha256-Qebx+7aIk7PL+nf7d2RraYYHapZDI4ZywahZ5UnlK5s=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "c48cc640477d55b74bafced5e86db22c87c87d96", + "rev": "8c63e6ee0f05eeace26612fc18b4260cccab5e1e", "type": "github" }, "original": { diff --git a/profiles/core.nix b/profiles/core.nix index 89f4d89..34eb83f 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -34,6 +34,8 @@ in zoxide bottom tealdeer + amber + unzip ]; shellAliases = diff --git a/users/patriot/default.nix b/users/patriot/default.nix index a5f321d..61c9a16 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -38,7 +38,7 @@ gnome3 = { gnome-keyring.enable = true; }; - xserver = { + /*xserver = { enable = true; desktopManager = { plasma5.enable = true; @@ -58,7 +58,7 @@ sddm.enable = true; startx.enable = false; }; - }; + };*/ }; systemd.user.services.gnome-session-restart-dbus.serviceConfig = { diff --git a/users/patriot/home.nix b/users/patriot/home.nix index ac523c5..4a1ab31 100644 --- a/users/patriot/home.nix +++ b/users/patriot/home.nix @@ -247,7 +247,7 @@ in inherit font; }; sway = { - enable = false; + enable = true; extraSessionCommands = '' export SDL_VIDEODRIVER=wayland # needs qt5.qtwayland in systemPackages @@ -332,7 +332,7 @@ in programs = { alacritty = { - enable = false; + enable = true; settings = { font = { normal = { family = font; }; @@ -467,15 +467,15 @@ in dotDir = ".config/zsh"; history.path = ".local/share/zsh/history"; envExtra = '' - #export SDL_VIDEODRIVER=wayland + export SDL_VIDEODRIVER=wayland # needs qt5.qtwayland in systemPackages - #export QT_QPA_PLATFORM=wayland - #export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_QPA_PLATFORM=wayland + export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" # Fix for some Java AWT applications (e.g. Android Studio), # use this if they aren't displayed properly: - #export _JAVA_AWT_WM_NONREPARENTING=1 + export _JAVA_AWT_WM_NONREPARENTING=1 ''; - /*loginExtra = + loginExtra = let #deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!"); in @@ -483,7 +483,7 @@ in if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then exec startplasma-x11 fi - '';*/ + ''; initExtra = '' bindkey "$terminfo[kRIT5]" forward-word bindkey "$terminfo[kLFT5]" backward-word @@ -520,7 +520,7 @@ in acc = "#${acColor}"; in { - enable = false; + enable = true; colors = { window = { background = bgc; @@ -701,27 +701,28 @@ in in (pkgs.vscode-utils.extensionsFromVscodeMarketplace [ # Rust - (mkExt "rust-analyzer" "0.2.441" "matklad" "sha256-aUX2HMMhS9bgTOmGgqZIgs0GBxmbJdr7J6loqwQTZeM=") - (mkExt "even-better-toml" "0.10.0" "tamasfe" "sha256-miJ7gXYavLyJneKOSs+4GaFG4v6ocem2YOWyAUrOfs8=") + (mkExt "rust-analyzer" "0.2.513" "matklad" "sha256-aUX2HMMhS9bgTOmGgqZIgs0GBxmbJdr7J6loqwQTZeM=") + (mkExt "even-better-toml" "0.11.1" "tamasfe" "sha256-miJ7gXYavLyJneKOSs+4GaFG4v6ocem2YOWyAUrOfs8=") (mkExt "vscode-ron" "0.9.0" "a5huynh" "sha256-J30hxEYCkr4xhaJ+DfffjwRJZx9NGCOrA6VcDCsodzQ=") - (mkExt "crates" "0.5.3" "serayuzgur" "sha256-TpzeEPBE75Ov2qDPa22k7e0pTDLQX8z0qBqCVLZXZ/Y=") + (mkExt "crates" "0.5.7" "serayuzgur" "sha256-TpzeEPBE75Ov2qDPa22k7e0pTDLQX8z0qBqCVLZXZ/Y=") # Nix - (mkExt "nix-env-selector" "0.1.2" "arrterian" "sha256-aTNxr1saUaN9I82UYCDsQvH9UBWjue/BSnUmMQOnsdg=") + (mkExt "nix-env-selector" "1.0.4" "arrterian" "sha256-aTNxr1saUaN9I82UYCDsQvH9UBWjue/BSnUmMQOnsdg=") (mkExt "nix-ide" "0.1.7" "jnoortheen" "sha256-NXMwd1Yi6kVxXLhWgzFOXQm580Mv4UPh6jUulbDnhK8=") # Go - (mkExt "Go" "0.20.1" "golang" "sha256-UjGaePjYceLdkf2yrxkVy6ht2aStJ5wklguKe/Z8HUI=") + (mkExt "Go" "0.23.1" "golang" "sha256-UjGaePjYceLdkf2yrxkVy6ht2aStJ5wklguKe/Z8HUI=") # Flutter and dart - (mkExt "flutter" "3.18.0" "Dart-Code" "sha256-nvKBPSe0+WQ8m88WrQqhzVrqYBjcBhiz6EuJ38gTFhQ=") - (mkExt "dart-code" "3.18.0" "Dart-Code" "sha256-E+qrY7wOvengOs2yKqhh+5dRLu3dUu6yWxGcwD7QHuI=") + (mkExt "flutter" "3.20.0" "Dart-Code" "sha256-nvKBPSe0+WQ8m88WrQqhzVrqYBjcBhiz6EuJ38gTFhQ=") + (mkExt "dart-code" "3.20.0" "Dart-Code" "sha256-E+qrY7wOvengOs2yKqhh+5dRLu3dUu6yWxGcwD7QHuI=") # protobuf (mkExt "vscode-proto3" "0.5.3" "zxh404" "sha256-oUSih+YdAXYkTNejZBJjcXewQewgQFMGhAFdJ/CBMd4=") # git - (mkExt "gitlens" "11.1.3" "eamodio" "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U=") - (mkExt "vscode-commitizen" "0.9.3" "KnisterPeter" "sha256-q9u3oSwFjDHwLsIUwMZ8huv9uXc1GWFfEOEMXWx3w/o=") + (mkExt "gitlens" "11.3.0" "eamodio" "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U=") + (mkExt "vscode-commitizen" "0.12.1" "KnisterPeter" "sha256-q9u3oSwFjDHwLsIUwMZ8huv9uXc1GWFfEOEMXWx3w/o=") # Customization # (mkExt "dance" "0.3.2" "gregoire" "sha256-+g8EXeCkPOPvZ60JoXkGTeSXYWrXmKrcbUaEfDppdgA=") (mkExt "material-icon-theme" "4.4.0" "PKief" "sha256-yiM+jtc7UW8PQTwmHmXHSSmvYC73GLh/cLYnmYqONdU=") (mkExt "github-vscode-theme" "1.1.5" "github" "sha256-EPAJjM4CbR8MhV+3pm6mC12KzSt2Em6pT+c2HknNntI=") + (mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=") ]) ++ [ pkgs.vscode-extensions.vadimcn.vscode-lldb ]; userSettings = { "workbench.iconTheme" = "material-icon-theme"; @@ -729,8 +730,8 @@ in "rust-analyzer.cargo.allFeatures" = true; "rust-analyzer.cargo.loadOutDirsFromCheck" = true; "rust-analyzer.procMacro.enable" = true; - "editor.fontFamily" = "'Iosevka'"; - "debug.console.fontFamily" = "Iosevka"; + "editor.fontFamily" = "'${font}'"; + "debug.console.fontFamily" = "${font}"; "debug.console.fontSize" = 12; "terminal.integrated.fontSize" = 12; "go.useLanguageServer" = true;