diff --git a/flake.lock b/flake.lock index e4d0290..2724239 100644 --- a/flake.lock +++ b/flake.lock @@ -1,60 +1,5 @@ { "nodes": { - "blender": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1734963688, - "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=", - "rev": "91297beb20864e611af6017c5eeef1b4564d7157", - "revCount": 132, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.12/01940c9d-feca-7111-a812-8d8ba9dd4fbd/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.12.tar.gz" - } - }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "jimhome", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -75,178 +20,6 @@ "type": "github" } }, - "disko_2": { - "inputs": { - "nixpkgs": [ - "jimhome", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", - "owner": "nix-community", - "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "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": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "jimhome", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "jimhome", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "jimhome", - "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": [ @@ -268,28 +41,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "jimhome", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -305,214 +56,7 @@ "type": "github" } }, - "impermanence_2": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, - "jimhome": { - "inputs": { - "blender": "blender", - "disko": "disko_2", - "home-manager": "home-manager_2", - "impermanence": "impermanence_2", - "lanzaboote": "lanzaboote", - "mailserver": "mailserver", - "minecraft": "minecraft", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur", - "unstable": "unstable" - }, - "locked": { - "lastModified": 1740772812, - "narHash": "sha256-Sdc97pWPQRZ7yIlr+iHBfWIl9A2ze5OeXjQnrGYKP8o=", - "ref": "refs/heads/main", - "rev": "5712f3bc442ea7bc751e9fe02de008c46c4e3f6a", - "revCount": 594, - "type": "git", - "url": "https://git.nixfox.ca/Jimbo/nixos-config" - }, - "original": { - "type": "git", - "url": "https://git.nixfox.ca/Jimbo/nixos-config" - } - }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": [ - "jimhome", - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.4.1", - "repo": "lanzaboote", - "type": "github" - } - }, - "mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-24_11": "nixpkgs-24_11" - }, - "locked": { - "lastModified": 1734884447, - "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "63209b1def2c9fc891ad271f474a3464a5833294", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "nixos-24.11", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, - "minecraft": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1739843142, - "narHash": "sha256-jpF2zYTQypG7ft7c4MoT8gitn5JAYuuv0XMVKwU8Fs0=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "ddda2b8d3e0cfd9d76f72b05b952ee3ef1e59b5f", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" - } - }, - "nixpkgs-24_11": { - "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" - } - }, - "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": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1740603184, "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", @@ -527,160 +71,16 @@ "type": "indirect" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1739903703, - "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", - "owner": "nix-community", - "repo": "NUR", - "rev": "2215ad5c4347f522523715e809f5f2022509f504", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "jimhome", - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "jimhome", - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", - "jimhome": "jimhome", - "nixpkgs": "nixpkgs_5", - "unstable": "unstable_2" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "jimhome", - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "jimhome", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "jimhome", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" + "nixpkgs": "nixpkgs", + "unstable": "unstable" } }, "unstable": { - "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "unstable_2": { "locked": { "lastModified": 1740560979, "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", diff --git a/flake.nix b/flake.nix index f7c1ec1..4f56ea5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,6 @@ url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - jimhome = { - url = "git+https://git.nixfox.ca/Jimbo/nixos-config"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { diff --git a/home/jimbo/default.nix b/home/jimbo/default.nix deleted file mode 100644 index 2f87054..0000000 --- a/home/jimbo/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, ... }: -{ - imports = [ - ./programs - ./settings - ./user - ]; - - config.home.stateVersion = "24.11"; -} diff --git a/home/jimbo/id_ed25519.pub b/home/jimbo/id_ed25519.pub deleted file mode 100644 index 075c2ce..0000000 --- a/home/jimbo/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4oyz5yAvmVZDdr3NL2AmlnCA6Z17b2Vj0FXj07DFiv diff --git a/home/jimbo/programs/btop/default.nix b/home/jimbo/programs/btop/default.nix deleted file mode 100644 index 3b478a3..0000000 --- a/home/jimbo/programs/btop/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: -{ - programs.btop = { - enable = true; - settings = { - vim_keys = true; - rounded_corners = false; - theme_background = false; - }; - }; -} diff --git a/home/jimbo/programs/default.nix b/home/jimbo/programs/default.nix deleted file mode 100644 index 3d4cc35..0000000 --- a/home/jimbo/programs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: -{ - imports = [ - ./btop - ./eza - ./git - ./headless - ./neovim - ./nh - ./nix-index - ./ranger - ./tmux - ./zsh - ]; -} diff --git a/home/jimbo/programs/eza/default.nix b/home/jimbo/programs/eza/default.nix deleted file mode 100644 index 6f8bc0b..0000000 --- a/home/jimbo/programs/eza/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - programs.eza = { - enable = true; - git = true; - icons = "auto"; - colors = "always"; - extraOptions = [ "--group-directories-first" ]; - }; -} diff --git a/home/jimbo/programs/git/default.nix b/home/jimbo/programs/git/default.nix deleted file mode 100644 index 5ec022a..0000000 --- a/home/jimbo/programs/git/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - programs.git = { - enable = true; - userName = "Jimbo"; - userEmail = "jimbo@nixfox.ca"; - }; - - programs.lazygit.enable = true; - - home.packages = with pkgs; [ - gnupg - git-crypt - ]; -} diff --git a/home/jimbo/programs/headless/default.nix b/home/jimbo/programs/headless/default.nix deleted file mode 100644 index ecdc584..0000000 --- a/home/jimbo/programs/headless/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, pkgs, ... }: -{ - home.packages = with pkgs; [ - dua - p7zip - vimv - ]; -} diff --git a/home/jimbo/programs/neovim/default.nix b/home/jimbo/programs/neovim/default.nix deleted file mode 100644 index 5168e1a..0000000 --- a/home/jimbo/programs/neovim/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ config, pkgs, ... }: -{ - programs.neovim = { - enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - plugins = with pkgs.vimPlugins; [ - # Vim theme - vim-airline - vim-airline-themes - - # Internal clipboard - vim-vsnip - cmp-vsnip - - # Autocomplete manager - lspkind-nvim - - # Autocomplete plugins - cmp-nvim-lsp - cmp-buffer - cmp-path - cmp-cmdline - nvim-cmp - - # Hex color visualizer and color theme - nvim-colorizer-lua - vim-monokai-pro - - # Discord RPC - vimsence - - # Nerdtree - nerdtree - vim-nerdtree-syntax-highlight - - # Misc languages - kdl-vim - ]; - extraConfig = '' - lua <'] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'vsnip' } - }, { - { name = 'buffer' }, - }) - }) - - -- Use buffer source for '/' and '?' - cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' } - } - }) - - -- Use cmdline & path source for ':' - cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) - }) - EOF - - colorscheme monokai_pro - let g:airline_theme='onedark' - let g:airline#extensions#tabline#enabled = 1 - hi Normal guibg=none ctermbg=235 - hi Visual guibg=#202020 ctermbg=238 - hi Pmenu guibg=#202020 ctermbg=238 - hi EndOfBuffer guibg=none ctermbg=235 - hi LineNr guibg=none ctermbg=none - lua require'colorizer'.setup() - - set nu rnu - set termguicolors - set mouse=a - - set undofile - set undodir=$HOME/.local/share/nvim/undo - set undolevels=100 - set undoreload=10000 - - nmap :bnext - nmap :bprev - nmap :bd - nmap :NERDTreeToggleVCS - ''; - }; -} diff --git a/home/jimbo/programs/nh/default.nix b/home/jimbo/programs/nh/default.nix deleted file mode 100644 index c1fe0a0..0000000 --- a/home/jimbo/programs/nh/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - programs.nh = { - enable = true; - flake = "/etc/nixos"; - }; -} diff --git a/home/jimbo/programs/nix-index/default.nix b/home/jimbo/programs/nix-index/default.nix deleted file mode 100644 index 3cbafd7..0000000 --- a/home/jimbo/programs/nix-index/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - programs.nix-index.enable = true; -} diff --git a/home/jimbo/programs/ranger/default.nix b/home/jimbo/programs/ranger/default.nix deleted file mode 100644 index 20895bb..0000000 --- a/home/jimbo/programs/ranger/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ config, ... }: -{ - programs.ranger = { - enable = true; - settings = { - dirname_in_tabs = true; - autosave_bookmarks = false; - show_hidden = true; - wrap_scroll = true; - column_ratios = "2,2,4"; - hidden_filter = ''^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$''; - }; - rifle = [ - # Media - { - condition = ''mime ^image, has imv, X, flag f''; - command = ''imv -- "$@"''; - } - { - condition = ''mime ^video, terminal, has mpv''; - command = ''mpv -- "$@"''; - } - { - condition = ''mime ^video, terminal, has mpv''; - command = ''mpv --video-rotate=270 -- "$@"''; - } - { - condition = ''mime ^audio|ogg$, terminal, has mpv''; - command = ''mpv --no-audio-display -- "$@"''; - } - { - condition = ''mime ^audio|ogg$, terminal, has mpv''; - command = ''mpv --shuffle --no-audio-display -- "$@"''; - } - { - condition = ''ext x?html?|pdf, has firefox, X, flag f''; - command = ''firefox -- "$@"''; - } - { - condition = ''ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f''; - command = ''libreoffice "$@"''; - } - - # Scripts - { - condition = ''sh''; - command = ''sh -- "$1"''; - } - { - condition = ''py''; - command = ''python -- "$1"''; - } - { - condition = ''pl''; - command = ''perl -- "$1"''; - } - { - condition = ''js''; - command = ''node -- "$1"''; - } - { - condition = ''php''; - command = ''php -- "$1"''; - } - - # Misc - { - condition = ''ext exe|msi''; - command = ''wine "$1"''; - } - { - condition = ''ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz|iso|jar|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip|zst, has 7z''; - command = ''7z x -- "$@"''; - } - { - condition = ''label open, has xdg-open''; - command = ''vim -- "$@"''; - } - ]; - plugins = [ - { - name = "devicons2"; - src = builtins.fetchGit { - url = "https://github.com/cdump/ranger-devicons2"; - rev = "94bdcc19218681debb252475fd9d11cfd274d9b1"; - }; - } - ]; - extraConfig = "default_linemode devicons2"; - }; - - # Ranger's bookmarks and necessary tools - home = { - file = { - ".local/share/ranger/bookmarks".text = '' - # Local files - h:/home/${config.home.username}/ - k:/home/${config.home.username}/Keepers - j:/home/${config.home.username}/Downloads - v:/home/${config.home.username}/Videos - c:/home/${config.home.username}/.config - l:/home/${config.home.username}/.local - d:/mnt - n:/etc/nixos - ''; - }; - }; -} diff --git a/home/jimbo/programs/tmux/default.nix b/home/jimbo/programs/tmux/default.nix deleted file mode 100644 index 338fa76..0000000 --- a/home/jimbo/programs/tmux/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ ... }: -{ - programs.tmux = { - enable = true; - keyMode = "vi"; - mouse = true; - terminal = "st-256color"; - historyLimit = 4096; - baseIndex = 1; - extraConfig = '' - set -g status on - set -g status-left "" - set -g status-position bottom - set -g status-right "#[bg=brightblack]#[fg=dark_purple] #T " - set -g status-style "bg=black" - - set -g set-titles on - set -g set-titles-string "#T" - - setw -g window-status-format "#[bg=brightmagenta]#[fg=black] #I #[bg=brightblack]#[fg=white] #W " - setw -g window-status-current-format "#[bg=brightmagenta]#[fg=black] #I #[bg=white]#[fg=black] #W " - ''; - }; -} diff --git a/home/jimbo/programs/zsh/default.nix b/home/jimbo/programs/zsh/default.nix deleted file mode 100644 index 0bed70e..0000000 --- a/home/jimbo/programs/zsh/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - programs.zsh = { - enable = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - oh-my-zsh = { - enable = true; - theme = "agnoster"; - plugins = [ - "git" - "history" - ]; - }; - initExtra = '' - source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh - source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh - setopt HIST_IGNORE_SPACE - setopt RM_STAR_WAIT - ''; - }; -} diff --git a/home/jimbo/settings/aliases/default.nix b/home/jimbo/settings/aliases/default.nix deleted file mode 100644 index 483318a..0000000 --- a/home/jimbo/settings/aliases/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - home.shellAliases = { - # NixOS - flakedate = "doas nix flake update --flake /etc/nixos"; - nhs = "doas nh os switch -R /etc/nixos"; - nixclean = "nix store gc; nix store optimise"; - - # Shortcuts - ff = "clear && fastfetch"; - ip = "ip -c"; - cat = "${pkgs.bat}/bin/bat --paging never"; - myip = "curl ifconfig.co"; - }; -} diff --git a/home/jimbo/settings/default.nix b/home/jimbo/settings/default.nix deleted file mode 100644 index b47f347..0000000 --- a/home/jimbo/settings/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ - ./aliases - ./nix - ]; -} diff --git a/home/jimbo/settings/nix/default.nix b/home/jimbo/settings/nix/default.nix deleted file mode 100644 index b35802a..0000000 --- a/home/jimbo/settings/nix/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, unstable, ... }: -{ - nix = { - package = lib.mkForce pkgs.nix; - settings.experimental-features = [ - "nix-command" - "flakes" - ]; - registry.unstable.flake = unstable; - }; - - _module.args.pkgsUnstable = import unstable { - inherit (pkgs.stdenv.hostPlatform) system; - inherit (config.nixpkgs) config; - }; -} diff --git a/home/jimbo/user/default.nix b/home/jimbo/user/default.nix deleted file mode 100644 index d00fca0..0000000 --- a/home/jimbo/user/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - home = { - username = "jimbo"; - homeDirectory = "/home/${config.home.username}"; - sessionVariables = { - EDITOR = "nvim"; - MANPAGER = "nvim +Man!"; - LIBVIRT_DEFAULT_URI = "qemu:///system"; - HISTCONTROL = "ignoreboth"; - NIXPKGS_ALLOW_UNFREE = 1; - }; - }; -} diff --git a/system/accounts/users/custom/jimbo/default.nix b/system/accounts/users/custom/jimbo/default.nix index ec04d4a..9b4efd8 100644 --- a/system/accounts/users/custom/jimbo/default.nix +++ b/system/accounts/users/custom/jimbo/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, jimhome, ... }: +{ config, pkgs, ... }: { users.users.jimbo = { hashedPassword = config.secrets.jimboAccPass; @@ -23,6 +23,4 @@ uid = 1000; shell = pkgs.zsh; }; - - home-manager.users.jimbo = import ../../../../../home/jimbo; } diff --git a/system/accounts/users/custom/jules/default.nix b/system/accounts/users/custom/jules/default.nix index f428f05..26ae6c9 100644 --- a/system/accounts/users/custom/jules/default.nix +++ b/system/accounts/users/custom/jules/default.nix @@ -22,6 +22,4 @@ uid = 1001; shell = pkgs.fish; }; - - #home-manager.users.jules = import ../../../../../home/jules; }