aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock387
-rw-r--r--flake.nix7
-rw-r--r--homes/floppydisk/default.nix2
-rw-r--r--homes/floppydisk/nvf.nix20
-rw-r--r--homes/floppydisk/packages.nix8
-rw-r--r--hosts/default.nix2
-rw-r--r--hosts/watermelon/configuration.nix8
7 files changed, 122 insertions, 312 deletions
diff --git a/flake.lock b/flake.lock
index 6c157ed..19cbab6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,45 +1,8 @@
{
"nodes": {
- "crane": {
- "inputs": {
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1711299236,
- "narHash": "sha256-6/JsyozOMKN8LUGqWMopKTSiK8N79T8Q+hcxu2KkTXg=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "880573f80d09e18a11713f402b9e6172a085449f",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_2": {
- "flake": false,
- "locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
@@ -55,27 +18,6 @@
},
"flake-parts": {
"inputs": {
- "nixpkgs-lib": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709336216,
- "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_2": {
- "inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
@@ -111,24 +53,6 @@
}
},
"flake-utils_2": {
- "inputs": {
- "systems": "systems_3"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -143,28 +67,6 @@
"type": "github"
}
},
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "lanzaboote",
- "pre-commit-hooks-nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -172,11 +74,11 @@
]
},
"locked": {
- "lastModified": 1716930911,
- "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=",
+ "lastModified": 1720646128,
+ "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086",
+ "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d",
"type": "github"
},
"original": {
@@ -201,11 +103,11 @@
]
},
"locked": {
- "lastModified": 1716576411,
- "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
+ "lastModified": 1720108799,
+ "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=",
"owner": "hyprwm",
"repo": "hyprcursor",
- "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
+ "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486",
"type": "github"
},
"original": {
@@ -214,41 +116,22 @@
"type": "github"
}
},
- "hyprgrass": {
- "inputs": {
- "hyprland": [
- "hyprland"
- ]
- },
- "locked": {
- "lastModified": 1716846659,
- "narHash": "sha256-LmoMki72bTyX0NT4hGkpAm86iQLBoMk3d3f0+QyddJw=",
- "owner": "horriblename",
- "repo": "hyprgrass",
- "rev": "6c3cfca50bb30065ba6d65a23cc5b4f66704a93e",
- "type": "github"
- },
- "original": {
- "owner": "horriblename",
- "repo": "hyprgrass",
- "type": "github"
- }
- },
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
+ "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
- "lastModified": 1716932244,
- "narHash": "sha256-bWV5tDVRL+If3KmeoY6do4prvkdLOQ9kYTKbwqHvjDw=",
+ "lastModified": 1720453602,
+ "narHash": "sha256-xohM9LAI3KL+YiPNoCUpuwGpG/foqfoJa1lLwUksaso=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "ebf258788e46cd0320fb17138ba413f719180418",
+ "rev": "b03f41efec14273cf25c42d4cef326acc36cb319",
"type": "github"
},
"original": {
@@ -271,11 +154,11 @@
]
},
"locked": {
- "lastModified": 1691753796,
- "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
+ "lastModified": 1718746314,
+ "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
- "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
+ "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290",
"type": "github"
},
"original": {
@@ -286,6 +169,10 @@
},
"hyprlang": {
"inputs": {
+ "hyprutils": [
+ "hyprland",
+ "hyprutils"
+ ],
"nixpkgs": [
"hyprland",
"nixpkgs"
@@ -296,11 +183,11 @@
]
},
"locked": {
- "lastModified": 1716473782,
- "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
+ "lastModified": 1720381373,
+ "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
+ "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb",
"type": "github"
},
"original": {
@@ -309,7 +196,7 @@
"type": "github"
}
},
- "hyprwayland-scanner": {
+ "hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
@@ -321,40 +208,41 @@
]
},
"locked": {
- "lastModified": 1716058375,
- "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
+ "lastModified": 1720203444,
+ "narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=",
"owner": "hyprwm",
- "repo": "hyprwayland-scanner",
- "rev": "3afed4364790aebe0426077631af1e164a9650cc",
+ "repo": "hyprutils",
+ "rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87",
"type": "github"
},
"original": {
"owner": "hyprwm",
- "repo": "hyprwayland-scanner",
+ "repo": "hyprutils",
"type": "github"
}
},
- "lanzaboote": {
+ "hyprwayland-scanner": {
"inputs": {
- "crane": "crane",
- "flake-compat": "flake-compat",
- "flake-parts": "flake-parts",
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs_2",
- "pre-commit-hooks-nix": "pre-commit-hooks-nix",
- "rust-overlay": "rust-overlay"
+ "nixpkgs": [
+ "hyprland",
+ "nixpkgs"
+ ],
+ "systems": [
+ "hyprland",
+ "systems"
+ ]
},
"locked": {
- "lastModified": 1716805126,
- "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=",
- "owner": "nix-community",
- "repo": "lanzaboote",
- "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2",
+ "lastModified": 1720215857,
+ "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=",
+ "owner": "hyprwm",
+ "repo": "hyprwayland-scanner",
+ "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb",
"type": "github"
},
"original": {
- "owner": "nix-community",
- "repo": "lanzaboote",
+ "owner": "hyprwm",
+ "repo": "hyprwayland-scanner",
"type": "github"
}
},
@@ -390,7 +278,7 @@
"nvf",
"nixpkgs"
],
- "rust-overlay": "rust-overlay_2"
+ "rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1714571717,
@@ -408,11 +296,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1716881121,
- "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=",
+ "lastModified": 1720515935,
+ "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf",
+ "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
"type": "github"
},
"original": {
@@ -424,11 +312,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1716330097,
- "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+ "lastModified": 1720031269,
+ "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+ "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github"
},
"original": {
@@ -450,45 +338,13 @@
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1710695816,
- "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
- "lastModified": 1711297276,
- "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable-small",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1716509168,
- "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+ "lastModified": 1720542800,
+ "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+ "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github"
},
"original": {
@@ -498,7 +354,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@@ -514,7 +370,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1702350026,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
@@ -548,8 +404,8 @@
},
"nvf": {
"inputs": {
- "flake-parts": "flake-parts_2",
- "flake-utils": "flake-utils_2",
+ "flake-parts": "flake-parts",
+ "flake-utils": "flake-utils",
"nil": "nil",
"nixpkgs": [
"nixpkgs"
@@ -610,6 +466,7 @@
"plugin-nvim-colorizer-lua": "plugin-nvim-colorizer-lua",
"plugin-nvim-cursorline": "plugin-nvim-cursorline",
"plugin-nvim-dap": "plugin-nvim-dap",
+ "plugin-nvim-dap-go": "plugin-nvim-dap-go",
"plugin-nvim-dap-ui": "plugin-nvim-dap-ui",
"plugin-nvim-docs-view": "plugin-nvim-docs-view",
"plugin-nvim-lightbulb": "plugin-nvim-lightbulb",
@@ -643,6 +500,7 @@
"plugin-toggleterm-nvim": "plugin-toggleterm-nvim",
"plugin-tokyonight": "plugin-tokyonight",
"plugin-trouble": "plugin-trouble",
+ "plugin-ts-error-translator": "plugin-ts-error-translator",
"plugin-vim-dirtytalk": "plugin-vim-dirtytalk",
"plugin-vim-fugitive": "plugin-vim-fugitive",
"plugin-vim-illuminate": "plugin-vim-illuminate",
@@ -652,15 +510,15 @@
"plugin-vim-vsnip": "plugin-vim-vsnip",
"plugin-which-key": "plugin-which-key",
"rnix-lsp": "rnix-lsp",
- "systems": "systems_4",
+ "systems": "systems_3",
"zig": "zig"
},
"locked": {
- "lastModified": 1716769902,
- "narHash": "sha256-aht7TJ5UcerxT+BS6Ct189xv6svcrGlY8A8lvPUZgEA=",
+ "lastModified": 1720645624,
+ "narHash": "sha256-0HyNR4+kJG4P2iH8kCX6NaNvPk3caL4Oo3GcJjEIqdo=",
"owner": "notashelf",
"repo": "nvf",
- "rev": "200a45ec73579ac36bf839212c5fe3fc25451b32",
+ "rev": "0c444830f694541ecd9db89cb3ee95e2c4fc3871",
"type": "github"
},
"original": {
@@ -1550,6 +1408,22 @@
"type": "github"
}
},
+ "plugin-nvim-dap-go": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1716775637,
+ "narHash": "sha256-B8A+ven18YgePLxAN3Q/j5NFb0FeTHCQak1uzaNDX9c=",
+ "owner": "leoluz",
+ "repo": "nvim-dap-go",
+ "rev": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "leoluz",
+ "repo": "nvim-dap-go",
+ "type": "github"
+ }
+ },
"plugin-nvim-dap-ui": {
"flake": false,
"locked": {
@@ -2078,6 +1952,22 @@
"type": "github"
}
},
+ "plugin-ts-error-translator": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1712269172,
+ "narHash": "sha256-NJ0qfKvkwZ/0GolAeATlQLyQ7nGN6Z6q3uRqI+73wPk=",
+ "owner": "dmmulroy",
+ "repo": "ts-error-translator.nvim",
+ "rev": "11ae55b28bde02663b5f983f59b0e3fd9c4e845b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "dmmulroy",
+ "repo": "ts-error-translator.nvim",
+ "type": "github"
+ }
+ },
"plugin-vim-dirtytalk": {
"flake": false,
"locked": {
@@ -2206,41 +2096,10 @@
"type": "github"
}
},
- "pre-commit-hooks-nix": {
- "inputs": {
- "flake-compat": [
- "lanzaboote",
- "flake-compat"
- ],
- "flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1710923068,
- "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"utils": "utils"
},
"locked": {
@@ -2260,42 +2119,15 @@
"root": {
"inputs": {
"home-manager": "home-manager",
- "hyprgrass": "hyprgrass",
"hyprland": "hyprland",
- "lanzaboote": "lanzaboote",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"nvf": "nvf"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1711246447,
- "narHash": "sha256-g9TOluObcOEKewFo2fR4cn51Y/jSKhRRo4QZckHLop0=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "dcc802a6ec4e9cc6a1c8c393327f0c42666f22e4",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
- "inputs": {
- "flake-utils": [
"nvf",
"nil",
"flake-utils"
@@ -2365,21 +2197,6 @@
"type": "github"
}
},
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"utils": {
"locked": {
"lastModified": 1656928814,
@@ -2412,11 +2229,11 @@
]
},
"locked": {
- "lastModified": 1716290197,
- "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
+ "lastModified": 1720194466,
+ "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
+ "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6",
"type": "github"
},
"original": {
@@ -2427,9 +2244,9 @@
},
"zig": {
"inputs": {
- "flake-compat": "flake-compat_2",
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_5"
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1716725305,
diff --git a/flake.nix b/flake.nix
index dbb772e..5e79ce2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,13 +56,8 @@
# nixos-hardware
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
- lanzaboote.url = "github:nix-community/lanzaboote";
-
hyprland.url = "github:hyprwm/Hyprland?submodules=1";
- hyprgrass = {
- url = "github:horriblename/hyprgrass";
- inputs.hyprland.follows = "hyprland";
- };
+
nvf = {
url = "github:notashelf/nvf";
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index bf680a8..87c9a9c 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -50,7 +50,7 @@
enable = true;
plugins = [
"git"
- "thefuck"
+# "thefuck"
];
custom = "$HOME/.oh-my-custom";
#theme = "powerlevel10k/powerlevel10k";
diff --git a/homes/floppydisk/nvf.nix b/homes/floppydisk/nvf.nix
index a8fb245..01003f0 100644
--- a/homes/floppydisk/nvf.nix
+++ b/homes/floppydisk/nvf.nix
@@ -78,12 +78,12 @@
};
};
- vim.theme = {
- enable = true;
- name = "onedark";
- style = "dark";
- transparent = false;
- };
+ #vim.theme = {
+ # enable = true;
+ # name = "onedark";
+ # style = "dark";
+ #transparent = false;
+ #};
vim.autopairs.enable = true;
vim.autocomplete = {
@@ -212,10 +212,10 @@
smartcolumn = {
enable = true;
setupOpts.custom_colorcolumn = {
- nix = 150;
- ruby = 110;
- java = 120;
- go = [110 150];
+ nix = "150";
+ ruby = "110";
+ java = "120";
+ go = ["110" "150"];
};
};
};
diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix
index 1dd29d2..a54ac6b 100644
--- a/homes/floppydisk/packages.nix
+++ b/homes/floppydisk/packages.nix
@@ -3,7 +3,7 @@
# utils
handbrake
thunderbird
- picard
+ #picard
rpi-imager
obs-studio
yt-dlp
@@ -20,7 +20,7 @@
fsv
lsd
lsdvd
- thefuck
+ # thefuck
zip
unzip
notion-app-enhanced
@@ -89,13 +89,13 @@
maven
purescript
lua
- flutter
+ #flutter
# comms
nheko
vesktop
caprine-bin
- teamspeak5_client
+ teamspeak_client
# gaming
rpcs3
diff --git a/hosts/default.nix b/hosts/default.nix
index 83b927d..f4393d2 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -2,7 +2,7 @@
# get inputs from self
inherit (self) inputs;
# get necessary inputs from self.inputs
- inherit (inputs) nixpkgs lanzaboote nixos-hardware;
+ inherit (inputs) nixpkgs;
inherit (inputs.home-manager.nixosModules) home-manager;
# get lib from nixpkgs and create and alias for lib.nixosSystem
# for potential future overrides & abstractions
diff --git a/hosts/watermelon/configuration.nix b/hosts/watermelon/configuration.nix
index 2185494..3c84464 100644
--- a/hosts/watermelon/configuration.nix
+++ b/hosts/watermelon/configuration.nix
@@ -15,15 +15,13 @@
services.xserver = {
enable = true;
xkb.layout = "us";
- libinput.enable = true;
};
services.tailscale.enable = true;
- hardware.opengl = {
+ hardware.graphics = {
enable = true;
- driSupport = true;
- driSupport32Bit = true;
+ enable32Bit = true;
};
nixpkgs = {
@@ -109,7 +107,7 @@
swayidle
wofi
swaylock
- gnome.gnome-keyring
+ gnome-keyring
gtklock
fprintd
tailscale
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-21 12:58:15 +0000