From 14214b351326929dfb0fb9e6b866ec505d47d4f4 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Thu, 17 Oct 2024 11:12:37 +0200 Subject: [PATCH] chore: remove unused garbage (1) --- flake.lock | 44 ++++++++++++++++----------------- flake.nix | 40 ++++++++++++------------------ modules/home/bat.nix | 10 -------- modules/home/default.violet.nix | 3 +-- 4 files changed, 39 insertions(+), 58 deletions(-) delete mode 100644 modules/home/bat.nix diff --git a/flake.lock b/flake.lock index 940ba9a..8633e46 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1728326504, - "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", + "lastModified": 1728902391, + "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", + "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1727821604, - "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728930677, - "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=", + "lastModified": 1729113795, + "narHash": "sha256-tV6aeQZ1wvAVDi+JW+IpXH9xQjZX+ZNFsuQCfWj2zWs=", "ref": "refs/heads/main", - "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b", - "revCount": 5343, + "rev": "b57086aa4362117c1f1025246f618d760e44b026", + "revCount": 5349, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -695,11 +695,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1728919237, - "narHash": "sha256-pjYeBH3eGhjIYyaHJbSOsPZZkbfJ07dO55NAxv7FUNY=", + "lastModified": 1729108264, + "narHash": "sha256-Jj0/IfDG9VpiByg823MjaDy6LIbUPjEfqsbqhJvI1RA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "2c8d8bb698899ac978f0ccc7b88cf2229593dacc", + "rev": "dd69b3d1751f0ba03711585cd0c03eae8ac93ea2", "type": "github" }, "original": { @@ -908,11 +908,11 @@ }, "nur": { "locked": { - "lastModified": 1729030016, - "narHash": "sha256-QRXlTt8YE69U6Ls/onHEj0bBiIkaVrecj1F2XYa2Jec=", + "lastModified": 1729154827, + "narHash": "sha256-arerFEy/TAFcXLH+wZv1PDleaXGUdc+xZID7OT29P+8=", "owner": "nix-community", "repo": "NUR", - "rev": "edbc15b9f52972a4d95545db61f093295bfb7612", + "rev": "343b1527111f1b2de0219adb6c7fc94b389bb7f9", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aee1bc9..e3411c1 100644 --- a/flake.nix +++ b/flake.nix @@ -7,29 +7,9 @@ nixvim.url = "github:ahwxorg/nixvim-config"; - hypr-contrib.url = "github:hyprwm/contrib"; - hyprpicker.url = "github:hyprwm/hyprpicker"; - alejandra.url = "github:kamadorueda/alejandra/3.0.0"; nix-gaming.url = "github:fufexan/nix-gaming"; - - hyprland = { - # type = "git"; - url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - # submodules = true; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - Hyprspace = { - url = "github:KZDKM/Hyprspace"; - inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync. - }; - - Hyswipe = { - url = "github:KZDKM/Hyswipe"; - inputs.hyprland.follows = "hyprland"; # Hyswipe uses latest Hyprland. We declare this to keep them in sync. - }; home-manager = { url = "github:nix-community/home-manager"; @@ -37,10 +17,22 @@ }; catppuccin.url = "github:catppuccin/nix"; - - catppuccin-bat = { - url = "github:catppuccin/bat"; - flake = false; + + hyprland = { + # type = "git"; + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # submodules = true; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypr-contrib.url = "github:hyprwm/contrib"; + hyprpicker.url = "github:hyprwm/hyprpicker"; + Hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync. + }; + Hyswipe = { + url = "github:KZDKM/Hyswipe"; + inputs.hyprland.follows = "hyprland"; # Hyswipe uses latest Hyprland. We declare this to keep them in sync. }; }; diff --git a/modules/home/bat.nix b/modules/home/bat.nix deleted file mode 100644 index 4f9b389..0000000 --- a/modules/home/bat.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - programs.bat = { - enable = true; - config = { - pager = "less -FR"; - theme = "base16"; - }; - }; -} diff --git a/modules/home/default.violet.nix b/modules/home/default.violet.nix index 9514cae..357a630 100644 --- a/modules/home/default.violet.nix +++ b/modules/home/default.violet.nix @@ -1,7 +1,6 @@ { ...}: { imports = - [(import ./bat.nix)] # better cat command - ++ [(import ./git.nix)] # version control + [(import ./git.nix)] # version control ++ [(import ./nvim.nix)] # neovim editor ++ [(import ./packages.violet.nix)] # other packages ++ [(import ./scripts/scripts.nix)] # personal scripts