diff --git a/assets/chinatown-rotated.png b/assets/chinatown-rotated.png deleted file mode 100644 index 696ff78..0000000 Binary files a/assets/chinatown-rotated.png and /dev/null differ diff --git a/flake.lock b/flake.lock index d5bdd00..cb3a719 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745855194, - "narHash": "sha256-l6ZmjOBl4KOjJ+KQEjR3GQdMP9Q+NlM+13BQ/N7vkOI=", + "lastModified": 1749289693, + "narHash": "sha256-fSMlofc9z/G/bfwgtDD+zy9RBqKR71FsLNU8mfLwPq0=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "7584efc530a1e3c71d20fe07ce33c0ce96ca2afe", + "rev": "57cb67bc61f8421c576085d595d902f02828d953", "type": "github" }, "original": { @@ -240,7 +240,10 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": [ + "nix-jetbrains-plugins", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -296,6 +299,24 @@ "inputs": { "systems": "systems_6" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_7" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -487,18 +508,38 @@ "type": "github" } }, + "nix-jetbrains-plugins": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1749916311, + "narHash": "sha256-hkyL/hAqsD46CnZi/3Mh30rK4N0EsdJBof5t9L1XSQQ=", + "owner": "theCapypara", + "repo": "nix-jetbrains-plugins", + "rev": "a8fefcb613f4fdf4ec0ac0eb2514855a16c785c3", + "type": "github" + }, + "original": { + "owner": "theCapypara", + "repo": "nix-jetbrains-plugins", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1749780394, - "narHash": "sha256-KZypZIU6L2EJRej+nBm5IuW6Q8nfccvylXWMkfhHTCA=", + "lastModified": 1750212369, + "narHash": "sha256-QXZc1il1KSGTtARN5ZI6wx1HxCXjEFZXsRZWl5+tOLc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "4f330afee93356ceedf61c772f9a296388db76aa", + "rev": "886fbf6b49af5754ed096e04f97fd9d87f0fd7e0", "type": "github" }, "original": { @@ -555,11 +596,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -569,6 +610,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1739863612, + "narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "632f04521e847173c54fa72973ec6c39a371211c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1742560374, @@ -585,6 +642,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1748929857, "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", @@ -600,13 +673,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { @@ -616,7 +689,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1744098102, "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", @@ -632,7 +705,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1744157173, "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", @@ -648,7 +721,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1748460289, "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", @@ -664,7 +737,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1730157240, "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", @@ -680,26 +753,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1739863612, - "narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "632f04521e847173c54fa72973ec6c39a371211c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim_2" }, "locked": { @@ -719,7 +776,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -738,7 +795,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -762,10 +819,10 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_8", - "systems": "systems_7", + "nixpkgs": "nixpkgs_9", + "systems": "systems_8", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -807,16 +864,16 @@ }, "remarks": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_8", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1748613246, - "narHash": "sha256-TVAkdTn4B/iT0ZXNgmIHEB1GEFDuOwKIKuX4DaFPF28=", + "lastModified": 1749656979, + "narHash": "sha256-RUiNsmyyHOgI49gY9Z+MZ3R0hVq9nrsFnUHN0S58rck=", "owner": "Scrybbling-together", "repo": "remarks", - "rev": "78a374a8abac158617a6512e2b31e2de5e8b620c", + "rev": "b418ebb6b87e125b8a7b32672ecaa2252b1a2655", "type": "github" }, "original": { @@ -832,8 +889,9 @@ "crowdsec": "crowdsec", "home-manager": "home-manager_2", "impermanence": "impermanence", + "nix-jetbrains-plugins": "nix-jetbrains-plugins", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "remarks": "remarks", @@ -945,6 +1003,21 @@ "type": "github" } }, + "systems_8": { + "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": [ @@ -995,14 +1068,14 @@ "git-hooks": "git-hooks", "haskell-flake": "haskell-flake", "nixos-unified": "nixos-unified", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1747754433, - "narHash": "sha256-TGH+IhbDPuJ4nnWveRmXL5+R2SAgu5nUvm2M1534rRc=", + "lastModified": 1750296979, + "narHash": "sha256-ETfQ0PySE61cdGm1X8q6Oz7MOu1bQfo5FxMdYMV4F80=", "ref": "refs/heads/master", - "rev": "abf0c78203f7644b4cca9a72fadefd142ab89604", - "revCount": 36, + "rev": "d90c4545ec819c71e85df4fcd7504c5f20fde636", + "revCount": 37, "type": "git", "url": "https://git.sajenim.dev/jasmine/xmonad-config.git" }, diff --git a/flake.nix b/flake.nix index 05862bb..354bd8c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ # Add any other flake you might need. nix-minecraft.url = "github:Infinidoge/nix-minecraft"; remarks.url = "github:Scrybbling-together/remarks"; + nix-jetbrains-plugins.url = "github:theCapypara/nix-jetbrains-plugins"; }; outputs = { diff --git a/home-manager/sajenim/features/desktop/xinitrc b/home-manager/sajenim/features/desktop/xinitrc index c96d774..8c4000a 100644 --- a/home-manager/sajenim/features/desktop/xinitrc +++ b/home-manager/sajenim/features/desktop/xinitrc @@ -1,10 +1,10 @@ #/bin/bash # Setup our monitors -xrandr --output HDMI-A-0 --mode 1920x1080 --rotate left --output DisplayPort-0 --mode 2560x1440 --right-of HDMI-A-0 +xrandr --output HDMI-A-0 --mode 1920x1080 --output DisplayPort-0 --mode 2560x1440 --right-of HDMI-A-0 # Apply our wallpaper -feh --bg-center ~/.repositories/forgejo/nix-config/assets/chinatown.png --bg-center ~/.repositories/forgejo/nix-config/assets/chinatown-rotated.png +feh --bg-center ~/.repositories/personal/nix-config/assets/chinatown.png # Disable screen saver and DPMS features xset s off -dpms diff --git a/home-manager/sajenim/features/editor/default.nix b/home-manager/sajenim/features/editor/default.nix deleted file mode 100644 index 9613e12..0000000 --- a/home-manager/sajenim/features/editor/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - inputs, - pkgs, - ... -}: { - home.packages = with pkgs; - [ - gcc - pandoc - python313Full - texliveFull - ] - ++ [ - inputs.nixvim.packages.${pkgs.system}.default - ]; -} diff --git a/home-manager/sajenim/features/editors/default.nix b/home-manager/sajenim/features/editors/default.nix new file mode 100644 index 0000000..e4f97aa --- /dev/null +++ b/home-manager/sajenim/features/editors/default.nix @@ -0,0 +1,30 @@ +{ + inputs, + pkgs, + ... +}: { + home.packages = with pkgs; + [ + # Toolchains + gcc + python313 + + # Typesetting + pandoc + texliveFull + ] + ++ [ + # Our personal neovim configuration. + inputs.nixvim.packages.${pkgs.system}.default + ] + # Install jetbrains IDEs with plugins + ++ (with inputs.nix-jetbrains-plugins.lib."${system}"; [ + (buildIdeWithPlugins pkgs.jetbrains "idea-community" [ + "IdeaVIM" + "gruvbox-material-dark" + ]) + ]); # https://github.com/theCapypara/nix-jetbrains-plugins + + # Copy our vim configuration file for jetbrains IDEs + home.file.".ideavimrc".source = ./ideavimrc; +} diff --git a/home-manager/sajenim/features/editors/ideavimrc b/home-manager/sajenim/features/editors/ideavimrc new file mode 100644 index 0000000..317e424 --- /dev/null +++ b/home-manager/sajenim/features/editors/ideavimrc @@ -0,0 +1,3 @@ +set number +set relativenumber +set clipboard=unnamedplus diff --git a/home-manager/sajenim/fuchsia.nix b/home-manager/sajenim/fuchsia.nix index 37e984c..b32c0b1 100644 --- a/home-manager/sajenim/fuchsia.nix +++ b/home-manager/sajenim/fuchsia.nix @@ -3,7 +3,7 @@ ./global ./features/cli ./features/desktop - ./features/editor + ./features/editors ./features/games ./features/printing ./features/university diff --git a/overlays/default.nix b/overlays/default.nix index fce11f2..ba218f6 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -20,7 +20,7 @@ unstable-packages = final: _prev: { unstable = import inputs.nixpkgs-unstable { system = final.system; - config.allowUnfree = true; + config.allowUnfree = false; }; }; }