diff --git a/flake.lock b/flake.lock index 031fc0f..ce388a5 100755 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -337,11 +337,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759386674, - "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=", + "lastModified": 1764081664, + "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "625ad6366178f03acd79f9e3822606dd7985b657", + "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", "type": "github" }, "original": { @@ -422,15 +422,16 @@ "systems": "systems" }, "locked": { - "lastModified": 1760153667, - "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=", + "lastModified": 1764172664, + "narHash": "sha256-j06Abkf2/5LtaoUS5XLiX3qDkoigwbt1MT4J8Lqpu2w=", "owner": "notashelf", "repo": "nvf", - "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d", + "rev": "353ade5acc809697febeef1caa2c2a597224cd62", "type": "github" }, "original": { "owner": "notashelf", + "ref": "v0.8", "repo": "nvf", "type": "github" } diff --git a/flake.nix b/flake.nix index 88c7cbd..302d332 100755 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nvf.url = "github:notashelf/nvf"; + nvf.url = "github:notashelf/nvf/v0.8"; stylix.url = "github:danth/stylix"; niri-flake.url = "github:sodiboo/niri-flake"; nur = { diff --git a/home.nix b/home.nix index cde1f84..716e6d6 100755 --- a/home.nix +++ b/home.nix @@ -26,7 +26,6 @@ in { # nixos/hm hm = lib.mkForce "home-manager"; - hm-check = lib.mkForce "nix check flake ${HOME}/dotfiles/."; hm-switch = lib.mkForce "home-manager switch --flake ${HOME}/.dotfiles/. -f ${HOME}/.dotfiles/home.nix"; nix-check = lib.mkForce "nix check flake /etc/nixos/."; nix-switch = lib.mkForce "nixos-rebuild switch --flake /etc/nixos/."; @@ -34,6 +33,7 @@ in { bashrcExtra = '' PS1="\u@\h:\w$ " eval "$(zoxide init bash)" + ${lib.getExe pkgs.cowsay} 'jag Woerter' ''; }; @@ -167,17 +167,11 @@ in { } ]; languages = { - assembly.enable = true; nix = { enable = true; format.enable = true; lsp.enable = true; }; - rust = { - enable = true; - format.enable = true; - lsp.enable = true; - }; haskell = { enable = true; lsp.enable = true; @@ -191,6 +185,7 @@ in { smarttab = true; foldmethod = "indent"; number = true; + colorcolumn = "80"; }; statusline.lualine.enable = true; syntaxHighlighting = true; @@ -335,12 +330,13 @@ in { pkgs.foot # terminal emulator pkgs.st # terminal emulator - pkgs.flameshot # screenshot pkgs.grim # screenshot + pkgs.slurp # screen selection pkgs.anki # anki pkgs.element-desktop pkgs.lagrange # gemini browser + pkgs.prismlauncher # alias pkgs.glow # see md files diff --git a/home/stylix.nix b/home/stylix.nix index e4b5390..8ba148f 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -17,6 +17,10 @@ name = "Miracode"; }; serif = config.stylix.fonts.sansSerif; + emoji = { + package = pkgs.noto-fonts-color-emoji; + name = "Noto Color Emoji"; + }; sizes = { applications = 12; terminal = 10; diff --git a/sway_config b/sway_config index 32f0d27..d1d7868 100755 --- a/sway_config +++ b/sway_config @@ -5,6 +5,7 @@ set $up k set $right l set $term alacritty set $menu wmenu-run +set $screenshot grim -g "$(slurp)" floating_modifier $mod normal workspace_layout stacking @@ -15,12 +16,13 @@ bindsym $mod+Shift+Return exec $term bindsym $mod+Shift+d exec $menu bindsym $mod+Shift+a exec anki bindsym $mod+Shift+q exec librewolf +bindsym $mod+Shift+s exec $screenshot bindsym $mod+Shift+c kill bindsym $mod+Shift+r reload -bindsym $mod+Shift+Alt+q exec swaynag -t warning -m 'Exit sway?' -B 'Yes, exit sway' 'swaymsg exit' +bindsym $mod+Shift+Alt+q exit bindsym $mod+$left focus left bindsym $mod+$down focus down