From 3311f30ee9916ac9e5043936cbe3e4878c24b68e Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 26 Nov 2024 21:11:07 -0600 Subject: [PATCH 1/5] get h002 working again --- dummy/flake.nix | 69 ++++++++++++++++++++++++++++++++++++ flake.lock | 18 +++++----- flake.nix | 10 ++++-- hosts/h002/configuration.nix | 4 +-- modules/boot/grub.nix | 2 +- 5 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 dummy/flake.nix diff --git a/dummy/flake.nix b/dummy/flake.nix new file mode 100644 index 0000000..b047a08 --- /dev/null +++ b/dummy/flake.nix @@ -0,0 +1,69 @@ +{ + description = "Dummy Stormd Service"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = + { self, nixpkgs }: + let + systems = nixpkgs.lib.systems.flakeExposed; + forAllSystems = nixpkgs.lib.genAttrs systems; + in + { + packages = forAllSystems (system: { + stormd = nixpkgs.legacyPackages.${system}.writeScriptBin "stormd" '' + #!${nixpkgs.legacyPackages.${system}.bash}/bin/bash + echo "This is a dummy stormd implementation" + exit 0 + ''; + default = self.packages.${system}.stormd; + }); + + apps = forAllSystems (system: { + stormd = { + type = "app"; + program = "${self.packages.${system}.stormd}/bin/stormd"; + }; + default = self.apps.${system}.stormd; + }); + + overlays = forAllSystems (system: [ (final: prev: { stormd = self.packages.${system}.stormd; }) ]); + + devShells = forAllSystems (system: { + default = nixpkgs.legacyPackages.${system}.mkShell { + packages = [ self.packages.${system}.stormd ]; + }; + }); + + nixosModules = forAllSystems ( + system: + { config, lib, ... }: + { + options = { + services.stormd = { + enable = lib.mkEnableOption "Enable the Stormd service."; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Extra options to pass to stormd daemon."; + }; + rootUser = lib.mkOption { + type = lib.types.str; + default = "root"; + description = "Root user name that will have stormd available."; + }; + nebulaPackage = lib.mkOption { + type = lib.types.package; + default = self.packages.${system}.stormd; + description = "The nebula package to use."; + }; + }; + }; + + config = lib.mkIf config.services.stormd.enable { }; + } + ); + }; +} diff --git a/flake.lock b/flake.lock index 9263df6..3190bfc 100644 --- a/flake.lock +++ b/flake.lock @@ -289,11 +289,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -1540,11 +1540,11 @@ ] }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1732674798, + "narHash": "sha256-oM1gjCv9R4zxDFO3as9wqQ4FI3+pDA9MKZ72L7tTIII=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "1d569430326b0a7807ccffdb2a188b814091976c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8eeab5e..9a5f47f 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,13 @@ url = "git+https://git.joshuabell.xyz/nvim"; }; ringofstorms-stormd = { + # Initial non git access run + # url = "./dummy"; + # inputs.nixpkgs.follows = "nixpkgs_stable"; + + # Normal access url = "git+ssh://git.joshuabell.xyz:3032/stormd"; + # Local path usage for testing changes locally # url = "path:/home/josh/projects/stormd"; }; @@ -164,9 +170,7 @@ path = lib.fileset.maybeMissing ./modules; recursive = true; } - ++ [ - ./hosts/configuration.nix - ]; + ++ [ ./hosts/configuration.nix ]; specialArgs = inputs // { inherit ylib; settings = diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix index 1492021..d7e03b6 100644 --- a/hosts/h002/configuration.nix +++ b/hosts/h002/configuration.nix @@ -12,14 +12,14 @@ # My custom modules mods = { - boot_grub = true; + boot_grub.enable = true; shell_common.enable = true; de_gnome_xorg.enable = true; audio_pulse.enable = true; neovim.enable = true; tty_caps_esc.enable = true; docker.enable = true; - # stormd.enable = true; + stormd.enable = true; nebula.enable = true; ssh.enable = true; }; diff --git a/modules/boot/grub.nix b/modules/boot/grub.nix index ca7a929..46f5e5e 100644 --- a/modules/boot/grub.nix +++ b/modules/boot/grub.nix @@ -12,7 +12,7 @@ in options = { mods.${name} = { enable = mkEnableOption (lib.mdDoc "Enable ${name}"); - device = mkDefaultOption { + device = mkOption { type = types.str; default = "/dev/sda"; description = '' From 9091b469e1b6f2fa20443a629c8a9a9225b065f5 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 4 Dec 2024 10:28:43 -0600 Subject: [PATCH 2/5] Update tmux bindings for some to not repeat --- .../home_manager/tmux/tmux-reset.conf | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/users/_common/components/home_manager/tmux/tmux-reset.conf b/users/_common/components/home_manager/tmux/tmux-reset.conf index e76043b..514597c 100644 --- a/users/_common/components/home_manager/tmux/tmux-reset.conf +++ b/users/_common/components/home_manager/tmux/tmux-reset.conf @@ -6,20 +6,20 @@ bind C-Space send-prefix # bind -r p previous-window # bind -r n next-window bind -r & kill-window -bind -r c new-window -c "#{pane_current_path}" +bind c new-window -c "#{pane_current_path}" bind ',' command-prompt "rename-window %%" bind "\|" split-window -h -c "#{pane_current_path}" bind "\\" split-window -v -c "#{pane_current_path}" bind w choose-tree -Zw -bind -r 1 select-window -t:1 -bind -r 2 select-window -t:2 -bind -r 3 select-window -t:3 -bind -r 4 select-window -t:4 -bind -r 5 select-window -t:5 -bind -r 6 select-window -t:6 -bind -r 7 select-window -t:7 -bind -r 8 select-window -t:8 -bind -r 9 select-window -t:9 +bind 1 select-window -t:1 +bind 2 select-window -t:2 +bind 3 select-window -t:3 +bind 4 select-window -t:4 +bind 5 select-window -t:5 +bind 6 select-window -t:6 +bind 7 select-window -t:7 +bind 8 select-window -t:8 +bind 9 select-window -t:9 # custom bind m command-prompt -p "Swap with window index:" "swap-window -t '%%'" bind -r [ swap-window -t -1 \; previous-window @@ -32,7 +32,7 @@ bind -r left select-pane -L bind -r down select-pane -D bind -r up select-pane -U bind -r right select-pane -R -bind -r x kill-pane +bind x kill-pane bind -r space resize-pane -Z bind S select-layout tiled bind -r h select-pane -L From 6256010acdb4538a489dd21a2db1c995f4a93264 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 4 Dec 2024 10:50:30 -0600 Subject: [PATCH 3/5] updates --- flake.lock | 200 +++++++++++++++++++-------------------- modules/shell/common.nix | 1 + 2 files changed, 101 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index 3190bfc..4c0733e 100644 --- a/flake.lock +++ b/flake.lock @@ -289,11 +289,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732510110, - "narHash": "sha256-vz4Il9oP5N1lXlwuXV3NOwH8RGbQ/ZEZhtnfgVRMBp4=", + "lastModified": 1733330745, + "narHash": "sha256-jy34Nf4Tn1ITZcYyMBn1/7jA8bCCIZDpiVahqlCXfww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f792ec7d1555d6b2af1889d21c5feeed9772f5e9", + "rev": "2f9d395f057a50f8076f633c10519035fce8d773", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1710100117, - "narHash": "sha256-xGQdEO8Fjh4Tmv5WnYJFqaitH0wZnLlbYstwqsO0Oeg=", + "lastModified": 1733158448, + "narHash": "sha256-JP3+goMgs3SiMHS9IVE7NAV/iKxyXi0fZgJb8hojtNQ=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "613c18967d42202f3e2a9ac788caf62a402e7c1a", + "rev": "9131016c1167e23522a8e874b62217829fd327b8", "type": "github" }, "original": { @@ -417,11 +417,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1732472049, - "narHash": "sha256-Jxa6Hy8rg5/osgWllpy0KJRTOmOiJ1Ry3QGrPMqx024=", + "lastModified": 1733328780, + "narHash": "sha256-vQ346D7MqbUhiGe5dQG521QGgMa3k4JtcbdVKPxqWZk=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "ac7edc4f8021124cb29892f1facdb1f3001688b6", + "rev": "77532363f8180ebd12669f08482182cecf67c8c6", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1731918376, - "narHash": "sha256-Yl95znL076u6cuSigMQpUOOBw9ZXfqy1a3JF0fL8+KI=", + "lastModified": 1733162004, + "narHash": "sha256-efDe3RXncnNVkj37AmIv8oj0DKurB50Dziao5FGTLP4=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58", + "rev": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1732338116, - "narHash": "sha256-BUHv4axSNZcVti/fs4249YZsBRcDlscVS4GaEH5zxE8=", + "lastModified": 1733302013, + "narHash": "sha256-F2fVuGXAUg4XKb3nCbXaO0AgIyRtGWYglK7am4jU49c=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "e1879e0ea3d5cee295b48335fc90e76ae8a63081", + "rev": "558310ae07b7bf0dffc478160513bb5c845f263c", "type": "github" }, "original": { @@ -545,11 +545,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1732474847, - "narHash": "sha256-Blxa6EENqd3wkBIFQuqd8vtsBpYEjkzBxpyBCWqSPUo=", + "lastModified": 1733270554, + "narHash": "sha256-Uym8zZpjhkQBpfMxG6JpEn0gnRPSmrMcrzSvHgXs4gY=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "bbd005a56daab7a19ceea22360a836957ac2c42c", + "rev": "80b0243371163258e6eb3f0932f717b2d732b64e", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1732383371, - "narHash": "sha256-w9WTvlytpYxnNZOf6AFZQP922lRsZ5WLO19N/w1Dl6k=", + "lastModified": 1733249728, + "narHash": "sha256-yFyW9CprEC/uOdz3Kgp7XJOHF+OUj9a9mxUF3qS8IAI=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "9b26b65187008dca1e423122eb06f7cfba75cb25", + "rev": "793bc848f71947f004c88c9fbc5604d55d4dddcc", "type": "github" }, "original": { @@ -641,11 +641,11 @@ "nvim_plugin-folke/which-key.nvim": { "flake": false, "locked": { - "lastModified": 1730919714, - "narHash": "sha256-5t6UnOP2+CXB55/C4YWbp2pE+xKDLMvCJK8m085Fk4w=", + "lastModified": 1732804356, + "narHash": "sha256-55RmbdN0rNG8946eIMFd5BlN82eY1GKqmHdUiC7BP+U=", "owner": "folke", "repo": "which-key.nvim", - "rev": "68e37e12913a66b60073906f5d3f14dee0de19f2", + "rev": "9b365a6428a9633e3eeb34dbef1b791511c54f70", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "nvim_plugin-hrsh7th/nvim-cmp": { "flake": false, "locked": { - "lastModified": 1732503167, - "narHash": "sha256-Rpb1rPYFQs74XzNQfj83o/l7bfM3GnYk+EqoDnz2JyM=", + "lastModified": 1732948484, + "narHash": "sha256-+0nflL0WCaxPuJgUviELhbXASNYYl/SKZ+nz70sEAXU=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "ed31156aa2cc14e3bc066c59357cc91536a2bc01", + "rev": "ca4d3330d386e76967e53b85953c170658255ecb", "type": "github" }, "original": { @@ -785,11 +785,11 @@ "nvim_plugin-lukas-reineke/indent-blankline.nvim": { "flake": false, "locked": { - "lastModified": 1731320409, - "narHash": "sha256-WVDNi/woG0ohPEYzM83mmXDCRNYnQbqooSDVUtBsJbY=", + "lastModified": 1733296464, + "narHash": "sha256-H3lUQZDvgj3a2STYeMUDiOYPe7rfsy08tJ4SlDd+LuE=", "owner": "lukas-reineke", "repo": "indent-blankline.nvim", - "rev": "7871a88056f7144defca9c931e311a3134c5d509", + "rev": "259357fa4097e232730341fa60988087d189193a", "type": "github" }, "original": { @@ -865,11 +865,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1731964536, - "narHash": "sha256-QgvFKV9QdfQ8Lh3EhXbwFcOQXTvaBE88EtbmJdJS9gk=", + "lastModified": 1733312834, + "narHash": "sha256-AIWHuxGX8GMz7jhzb4eHMeb5qd9t/YAmWLnnMNO+npc=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "6e742b9fc6a37e46181879f6c32cecfa8cd2cebf", + "rev": "bf3d8c7bcbf20a7e7f4af36c2d5390ca6ad43281", "type": "github" }, "original": { @@ -881,11 +881,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1732458499, - "narHash": "sha256-Sdv9eHCwVtC58S5C+fWAWA4MWRCWpDvrjZbOl+81eO0=", + "lastModified": 1733290567, + "narHash": "sha256-Wh2evCVtvRjsIR9ws5Svt8Po21F6seieIy6ienBUrHg=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "dafd61d6533bd90ecf6e2a3a972298fdddc74d82", + "rev": "6e385d2fe5da6714f00142afbd8d3591d330ffd7", "type": "github" }, "original": { @@ -910,6 +910,22 @@ "type": "github" } }, + "nvim_plugin-numToStr/Comment.nvim": { + "flake": false, + "locked": { + "lastModified": 1717957420, + "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=", + "owner": "numToStr", + "repo": "Comment.nvim", + "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb", + "type": "github" + }, + "original": { + "owner": "numToStr", + "repo": "Comment.nvim", + "type": "github" + } + }, "nvim_plugin-nvim-lua/plenary.nvim": { "flake": false, "locked": { @@ -993,11 +1009,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1730164948, - "narHash": "sha256-Qa/f+0asQvA8mhIUajC4BGZCI92OqA6ySVoQSC3ZY3s=", + "lastModified": 1732884846, + "narHash": "sha256-npb61MZYAotz71Co5G1dUeIqWt7GVeqZNz0A2Yz2dy4=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "85922dde3767e01d42a08e750a773effbffaea3e", + "rev": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc", "type": "github" }, "original": { @@ -1025,11 +1041,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1732506734, - "narHash": "sha256-5Xs53D2qsKuSBTduUhU1FOe+LGSh1X5+XmGUTBL+y8A=", + "lastModified": 1732925137, + "narHash": "sha256-Sh+r54pTI60j5tOmSyEkTVS6MzMIt52nqjNdtMp8kpI=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509", + "rev": "203da76ecfbb4b192cf830665b03eb651b635c94", "type": "github" }, "original": { @@ -1041,11 +1057,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1732257841, - "narHash": "sha256-92RJT4khgEfvLO5WOdUWwUvEVBrJTuIgXonHYV8smPw=", + "lastModified": 1733329191, + "narHash": "sha256-3bUPP/wOkfaOMaQGQHKB/i1aZ1DrWNB+iJ2dXbZeMAo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "8e412ebe97d84504b68a071ecf9bb68413b13632", + "rev": "8ebcf62cf48dd97b3d121884ecb6bc4c00f1b069", "type": "github" }, "original": { @@ -1054,30 +1070,14 @@ "type": "github" } }, - "nvim_plugin-preservim/nerdcommenter": { - "flake": false, - "locked": { - "lastModified": 1729604332, - "narHash": "sha256-IW4RToMGwOSX0GbNXpBkOqtZ2C9Mgbk6iZWPGX5jDr4=", - "owner": "preservim", - "repo": "nerdcommenter", - "rev": "66c07e4083ab02ed2540ac289cc602c70b858c13", - "type": "github" - }, - "original": { - "owner": "preservim", - "repo": "nerdcommenter", - "type": "github" - } - }, "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1728273759, - "narHash": "sha256-H94Ryad0ZsSg/gioUgW+7sowij7GgtEUMNFi1IOZAys=", + "lastModified": 1733106470, + "narHash": "sha256-I8SRZxnoNC6SOWW+scoA77Jwyxcb4eUczppLdyOiZe0=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "de8fce94985873666bd9712ea3e49ee17aadb1ed", + "rev": "efff286dd74c22f731cdec26a70b46e5b203c619", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1731965533, - "narHash": "sha256-PynOONqzikhpY6yF3G7m1YtrNEVQUK8+bqbcqg/redY=", + "lastModified": 1732719937, + "narHash": "sha256-1tg7H8ssnG7ArshQiyoFenXzf9PVealOPbzuZKacO1U=", "owner": "rmagatti", "repo": "auto-session", - "rev": "8d2eddb14ef66ed1019c92251e2d31bb7a2a2f87", + "rev": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1732487744, - "narHash": "sha256-GmKhbXWw61qCkYYvQeYOA590DmSfyQi4Ec3REGSLqq8=", + "lastModified": 1733253508, + "narHash": "sha256-n6sOzOpHkvbDyyNWuqy/t86MhkkB5MYoNdx0ljuuhRU=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "a203480a350b03092e473bf3001733d547160a73", + "rev": "02fd64fb3d4b18ec029c0e0683c3dc3ec6d2c5b8", "type": "github" }, "original": { @@ -1249,11 +1249,11 @@ "nvim_plugin-windwp/nvim-ts-autotag": { "flake": false, "locked": { - "lastModified": 1724798540, - "narHash": "sha256-QEzUKvT+ChYSa9F4zg3Lw+7Sj0JzJem9nh2mWmS8Y+I=", + "lastModified": 1733164313, + "narHash": "sha256-v2NTFBIzKTYizUPWB3uhpnTGVZWaelhE3MT5+BDA6Do=", "owner": "windwp", "repo": "nvim-ts-autotag", - "rev": "e239a560f338be31337e7abc3ee42515daf23f5e", + "rev": "1cca23c9da708047922d3895a71032bc0449c52d", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1732440570, - "narHash": "sha256-VfixVkuF0YEZCz6zhS0wKhZ29/AYOjwnMdO+8zB4QbU=", + "lastModified": 1733309827, + "narHash": "sha256-ShJv87xIkHkXi62d9VomfP8QI4kEosS1hrMc/rSmvEs=", "owner": "yetone", "repo": "avante.nvim", - "rev": "890fd9259459c065cb452be9ed72318994ac81e2", + "rev": "6206998f240da6734bd49d830d76b2035d173f1d", "type": "github" }, "original": { @@ -1390,6 +1390,7 @@ "nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim", "nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig", "nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim", + "nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim", "nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim", "nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim", "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": "nvim_plugin-nvim-telescope/telescope-file-browser.nvim", @@ -1399,7 +1400,6 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": "nvim_plugin-nvim-tree/nvim-tree.lua", "nvim_plugin-nvim-tree/nvim-web-devicons": "nvim_plugin-nvim-tree/nvim-web-devicons", "nvim_plugin-nvim-treesitter/nvim-treesitter-context": "nvim_plugin-nvim-treesitter/nvim-treesitter-context", - "nvim_plugin-preservim/nerdcommenter": "nvim_plugin-preservim/nerdcommenter", "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets", "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify", "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session", @@ -1418,11 +1418,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1732511670, - "narHash": "sha256-He8TJL188hEJRbfpO0XMnWXD29L0MVE6It5vv9ZTDQ8=", + "lastModified": 1733331011, + "narHash": "sha256-HNbtLYfvHyHuoT9aBtL8s+rOtbJo7AGaEccvbpw4XU8=", "ref": "refs/heads/master", - "rev": "6083bdb668be1a1fae30d0ecc38513fde91a2204", - "revCount": 235, + "rev": "70ecd62a91bfb50eff3bfcb3289a544b162cada5", + "revCount": 240, "type": "git", "url": "https://git.joshuabell.xyz/nvim" }, @@ -1438,11 +1438,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1732672287, - "narHash": "sha256-JdcYW3Mx0zWU7xMazQOq2jjChHbLt67k3Sx7Izujrzo=", + "lastModified": 1732677192, + "narHash": "sha256-Q8Tv53BKkdf4g01+NGqnly+hE+vIyBnloz4QG8NXMaw=", "ref": "refs/heads/master", - "rev": "7ffe560c5e2aa79eda3b714fd0d82a51c8cd4f95", - "revCount": 43, + "rev": "09a457218ae1973ca4a6da526b51ac6a98749038", + "revCount": 44, "type": "git", "url": "ssh://git.joshuabell.xyz:3032/stormd" }, @@ -1519,11 +1519,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1733279627, + "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", "type": "github" }, "original": { @@ -1540,11 +1540,11 @@ ] }, "locked": { - "lastModified": 1732674798, - "narHash": "sha256-oM1gjCv9R4zxDFO3as9wqQ4FI3+pDA9MKZ72L7tTIII=", + "lastModified": 1729218602, + "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d569430326b0a7807ccffdb2a188b814091976c", + "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "type": "github" }, "original": { diff --git a/modules/shell/common.nix b/modules/shell/common.nix index e2b90df..2a52b19 100644 --- a/modules/shell/common.nix +++ b/modules/shell/common.nix @@ -79,6 +79,7 @@ in diff = "git diff"; branches = "git branch -a"; gcam = "git commit -a -m"; + gcm = "git commit -m"; stashes = "git stash list"; # ripgrep From ce5b732dfa7fe7aa9e8b95d52b5f6e8990834eb1 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Dec 2024 02:39:03 -0600 Subject: [PATCH 4/5] updates --- flake.lock | 204 +++++++++++++++++------------------ flake.nix | 6 +- hosts/h002/configuration.nix | 2 +- hosts/lio/configuration.nix | 3 +- modules/audio_pulse.nix | 22 +++- modules/saber.nix | 26 +++++ modules/validations.nix | 7 +- 7 files changed, 156 insertions(+), 114 deletions(-) create mode 100644 modules/saber.nix diff --git a/flake.lock b/flake.lock index 4c0733e..0d99a02 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731381599, - "narHash": "sha256-W+FuVxCdCiw7IaAWPajq9iOuM57zITFnbkw2ZQXfW9I=", + "lastModified": 1734227601, + "narHash": "sha256-H3lZV8A1cn2TopvJnjHmSLbzj12X9nlcVZuEWHHW+iE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "23976d5dac8b0f07187bc3c95e3812304519e5e3", + "rev": "0a12841c81a192a6f76a51d9f07ad6bc22206cce", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "gpdPocket3_nixpkgs": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "h002_nixpkgs": { "locked": { - "lastModified": 1724855419, - "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "joe_nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "type": "github" }, "original": { @@ -257,32 +257,32 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "lio_nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -304,11 +304,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -320,43 +320,43 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1733330745, - "narHash": "sha256-jy34Nf4Tn1ITZcYyMBn1/7jA8bCCIZDpiVahqlCXfww=", + "lastModified": 1733900158, + "narHash": "sha256-Tu5ATWupdyxdlvqOYgdS2NpweapN6pYeQss20kxEUv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2f9d395f057a50f8076f633c10519035fce8d773", + "rev": "2bd5a84b9c99317f04fd91ed57ee012024a9f33f", "type": "github" }, "original": { @@ -384,16 +384,16 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -417,11 +417,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1733328780, - "narHash": "sha256-vQ346D7MqbUhiGe5dQG521QGgMa3k4JtcbdVKPxqWZk=", + "lastModified": 1733789009, + "narHash": "sha256-whmqdJuTZfJsRvu7vmqbZPXUd9obLJoAogvFTlbLUC0=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "77532363f8180ebd12669f08482182cecf67c8c6", + "rev": "db95d18a4f645ec6b745ef9db91adf4665824f22", "type": "github" }, "original": { @@ -433,11 +433,11 @@ "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": { "flake": false, "locked": { - "lastModified": 1728200262, - "narHash": "sha256-uJDuxc6iDo/fCtfRUpUmE4HIaH9YBs44+vXzw/yFP64=", + "lastModified": 1733574156, + "narHash": "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=", "owner": "JoosepAlviste", "repo": "nvim-ts-context-commentstring", - "rev": "9c74db656c3d0b1c4392fc89a016b1910539e7c0", + "rev": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1733302013, - "narHash": "sha256-F2fVuGXAUg4XKb3nCbXaO0AgIyRtGWYglK7am4jU49c=", + "lastModified": 1733775668, + "narHash": "sha256-4GCKx7krZ7aUIK6Xo/07sMWXSRuRUJJ8qTvwJ0Efrg4=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "558310ae07b7bf0dffc478160513bb5c845f263c", + "rev": "e41b0002fe4196825450ab5a6343300c40791d51", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1726376728, - "narHash": "sha256-90Wq+vT361mTaGU/SvAezqJkX9HHmZ2GI2fKBDxPn04=", + "lastModified": 1733856815, + "narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f", + "rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46", "type": "github" }, "original": { @@ -545,11 +545,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1733270554, - "narHash": "sha256-Uym8zZpjhkQBpfMxG6JpEn0gnRPSmrMcrzSvHgXs4gY=", + "lastModified": 1733821249, + "narHash": "sha256-ev02DBcXNY9cFEeCFjc5Kj2P7W0Jlv0oHWIvIuk8oos=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "80b0243371163258e6eb3f0932f717b2d732b64e", + "rev": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df", "type": "github" }, "original": { @@ -609,11 +609,11 @@ "nvim_plugin-folke/lazy.nvim": { "flake": false, "locked": { - "lastModified": 1732091289, - "narHash": "sha256-4M2MumRyX5XmsomXPMjOAJQsNaaRnbWmtUDm1fM3izk=", + "lastModified": 1733857941, + "narHash": "sha256-ggseHUfnMiUnyFia9driFzz7civjn/9TG8aIQLU+N4A=", "owner": "folke", "repo": "lazy.nvim", - "rev": "56ead98e05bb37a4ec28930a54d836d033cf00f2", + "rev": "7c493713bc2cb392706866eeba53aaef6c8e9fc6", "type": "github" }, "original": { @@ -673,11 +673,11 @@ "nvim_plugin-hrsh7th/cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1715931395, - "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=", + "lastModified": 1733823748, + "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d", + "rev": "99290b3ec1322070bcfb9e846450a46f6efa50f0", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "nvim_plugin-hrsh7th/nvim-cmp": { "flake": false, "locked": { - "lastModified": 1732948484, - "narHash": "sha256-+0nflL0WCaxPuJgUviELhbXASNYYl/SKZ+nz70sEAXU=", + "lastModified": 1733799872, + "narHash": "sha256-Aht1m2V+yRvmrLoBC4QGYG/p/tmDbnZe1nT3V5k7S58=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "ca4d3330d386e76967e53b85953c170658255ecb", + "rev": "3403e2e9391ed0a28c3afddd8612701b647c8e26", "type": "github" }, "original": { @@ -817,11 +817,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1728748235, - "narHash": "sha256-iEA14DhSxmKxPE2TCa7csJ2ZSaN7enI0kwZCxDPL/e4=", + "lastModified": 1733892652, + "narHash": "sha256-lfZl1cnk5tpZXefDk6EF+ipi7JLhxNYV5V3CA1CmP+A=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "027d6f991927a71bd510a7673ae5bb404ca2a1c7", + "rev": "38a38ffd0c0ce7e47c2baede3e20bfeceb3f97e0", "type": "github" }, "original": { @@ -865,11 +865,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1733312834, - "narHash": "sha256-AIWHuxGX8GMz7jhzb4eHMeb5qd9t/YAmWLnnMNO+npc=", + "lastModified": 1733693806, + "narHash": "sha256-2t2fiqMlOWy48TXpqWbVJfwEQnT+G9BubOd7SVBQSWw=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "bf3d8c7bcbf20a7e7f4af36c2d5390ca6ad43281", + "rev": "a244210b28f9055c2b4cfa85c92c8a71c13671c9", "type": "github" }, "original": { @@ -881,11 +881,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1733290567, - "narHash": "sha256-Wh2evCVtvRjsIR9ws5Svt8Po21F6seieIy6ienBUrHg=", + "lastModified": 1733807465, + "narHash": "sha256-AdNxaLAZTD3cOBNPBkf2W1UllNTnCmUTeGQ3SxnwTr0=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "6e385d2fe5da6714f00142afbd8d3591d330ffd7", + "rev": "5a812abc65d529ea7673059a348814c21d7f87ff", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1732428058, - "narHash": "sha256-HHgC7aH2m3gv2FtOK1jhjBgJOGWrdc+FQOEpMiEWe74=", + "lastModified": 1733619933, + "narHash": "sha256-3ZIxXhrCQM3rZA7QwqTo8VV5yxyvd3WhQjiAVOgK/l8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97", + "rev": "db8d7ac1f524fc6f808764b29fa695c51e014aa6", "type": "github" }, "original": { @@ -1041,11 +1041,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1732925137, - "narHash": "sha256-Sh+r54pTI60j5tOmSyEkTVS6MzMIt52nqjNdtMp8kpI=", + "lastModified": 1733841649, + "narHash": "sha256-7ma/wkA+nHzp+Le9OQTjEeOCs3ZmYvciVuCloI5Jw5c=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "203da76ecfbb4b192cf830665b03eb651b635c94", + "rev": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1733329191, - "narHash": "sha256-3bUPP/wOkfaOMaQGQHKB/i1aZ1DrWNB+iJ2dXbZeMAo=", + "lastModified": 1733643905, + "narHash": "sha256-1ERiDz2A4NeX54bMgMsIAkSDVXtYA2PBzvJTh7upWoY=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "8ebcf62cf48dd97b3d121884ecb6bc4c00f1b069", + "rev": "3288c5af7d3820d716272f1d05ab661cc540a5d6", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1733253508, - "narHash": "sha256-n6sOzOpHkvbDyyNWuqy/t86MhkkB5MYoNdx0ljuuhRU=", + "lastModified": 1733857807, + "narHash": "sha256-hT3K+UzNpVGScgdZWtyQj+kFbqcD6PNeRTZ2f9nDEXY=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "02fd64fb3d4b18ec029c0e0683c3dc3ec6d2c5b8", + "rev": "f4e8837878fc5712d053ba3091a73d27d96a09e2", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1733309827, - "narHash": "sha256-ShJv87xIkHkXi62d9VomfP8QI4kEosS1hrMc/rSmvEs=", + "lastModified": 1733420133, + "narHash": "sha256-erB/WVH+K9vNM30Bmfih7DuuLy+1Ns/begNCMUYbNEA=", "owner": "yetone", "repo": "avante.nvim", - "rev": "6206998f240da6734bd49d830d76b2035d173f1d", + "rev": "4464b7f4ae26254cd506a354284a02129941e244", "type": "github" }, "original": { @@ -1297,11 +1297,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1729295476, - "narHash": "sha256-UY6N2Q+egh+Cn4REZXrSGH9ElWQBedl0n8tWJvGe7vs=", + "lastModified": 1733331245, + "narHash": "sha256-0GwiWk3sNJbU0W+YoAKEdOxNmeLoHe2a8iy2ohRlukQ=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0", + "rev": "c810500b69cb8bcea58f2be635cb1340011714b5", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1733331011, - "narHash": "sha256-HNbtLYfvHyHuoT9aBtL8s+rOtbJo7AGaEccvbpw4XU8=", + "lastModified": 1734336949, + "narHash": "sha256-wxOSA/sAxCsdXu0xeRNVwJlKzbyyhAYDmSD8+DUt+eE=", "ref": "refs/heads/master", - "rev": "70ecd62a91bfb50eff3bfcb3289a544b162cada5", - "revCount": 240, + "rev": "0eac4298a3f5e7dc0c7d31f7a034c864926f6b36", + "revCount": 243, "type": "git", "url": "https://git.joshuabell.xyz/nvim" }, @@ -1477,11 +1477,11 @@ ] }, "locked": { - "lastModified": 1731292155, - "narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=", + "lastModified": 1734143514, + "narHash": "sha256-1+r8wYucn8kp9d/IBW1uYGs31QQmSZURElsiOTx65xM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a", + "rev": "81fe5c27cb281a9b796d7ad05ad9179e5bd0c78d", "type": "github" }, "original": { @@ -1519,11 +1519,11 @@ ] }, "locked": { - "lastModified": 1733279627, - "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", + "lastModified": 1733884434, + "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", + "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9a5f47f..83ce7ae 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { # Host flake pinning - lio_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + lio_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; lio_home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "lio_nixpkgs"; }; @@ -27,7 +27,7 @@ inputs.nixpkgs.follows = "gpdPocket3_nixpkgs"; }; - nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.11"; # Nix utility methods nypkgs = { url = "github:yunfachi/nypkgs"; diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix index d7e03b6..109f289 100644 --- a/hosts/h002/configuration.nix +++ b/hosts/h002/configuration.nix @@ -15,7 +15,7 @@ boot_grub.enable = true; shell_common.enable = true; de_gnome_xorg.enable = true; - audio_pulse.enable = true; + audio.enable = true; neovim.enable = true; tty_caps_esc.enable = true; docker.enable = true; diff --git a/hosts/lio/configuration.nix b/hosts/lio/configuration.nix index 30f0742..f9fc25a 100644 --- a/hosts/lio/configuration.nix +++ b/hosts/lio/configuration.nix @@ -14,7 +14,7 @@ boot_systemd.enable = true; shell_common.enable = true; # de_cosmic.enable = true; - audio_pulse.enable = true; + audio.enable = true; de_gnome_xorg.enable = true; # de_gnome_wayland.enable = true; neovim.enable = true; @@ -25,6 +25,7 @@ stormd.enable = true; nebula.enable = true; rustdesk.enable = true; + saber.enable = true; }; # opening this port for dev purposes diff --git a/modules/audio_pulse.nix b/modules/audio_pulse.nix index d4503fe..079d102 100644 --- a/modules/audio_pulse.nix +++ b/modules/audio_pulse.nix @@ -6,7 +6,7 @@ }: with lib; let - name = "audio_pulse"; + name = "audio"; cfg = config.mods.${name}; in { @@ -18,8 +18,22 @@ in config = mkIf cfg.enable { # Enable sound. - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; - environment.systemPackages = [ pkgs.pavucontrol ]; + # sound.enable = true; + # services.pipewire.pulse.enable = false; + # services.pipewire.enable = false; + # services.pipewire.audio.enable =false; + # hardware.pulseaudio.enable = true; + # hardware.pulseaudio.package = pkgs.pulseaudioFull; + # environment.systemPackages = [ pkgs.pavucontrol ]; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + }; }; } diff --git a/modules/saber.nix b/modules/saber.nix new file mode 100644 index 0000000..adc2218 --- /dev/null +++ b/modules/saber.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + settings, + ... +}: +with lib; +let + name = "saber"; + cfg = config.mods.${name}; +in +{ + options = { + mods.${name} = { + enable = mkEnableOption (lib.mdDoc "Enable ${name}"); + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + saber + ]; + }; +} + diff --git a/modules/validations.nix b/modules/validations.nix index 548ee4d..5b5a991 100644 --- a/modules/validations.nix +++ b/modules/validations.nix @@ -19,10 +19,11 @@ ''; } { - assertion = !(config.mods.de_cosmic.enable && config.mods.audio_pulse.enable); + # // TODO check sinc epoulse is no longer + assertion = !(config.mods.de_cosmic.enable && config.mods.audio.enable); message = '' - Configuration Error: cannot use pulse audio with cosmic. - Remove: mods.audio_pulse.enable + Configuration Error: cannot use audio with cosmic. Check if this is true anymore... + Remove: mods.audio.enable ''; } ]; From 07ecdf70e323fb787f428860379d10ab56e12a02 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 16 Dec 2024 13:03:42 -0600 Subject: [PATCH 5/5] updates --- flake.nix | 12 ++++++------ modules/de/gnome_wayland.nix | 2 +- modules/de/gnome_xorg.nix | 2 +- users/josh/home_manager/de/gnome.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 83ce7ae..c15e520 100644 --- a/flake.nix +++ b/flake.nix @@ -9,21 +9,21 @@ inputs.nixpkgs.follows = "lio_nixpkgs"; }; - joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; joe_home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "joe_nixpkgs"; }; - h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; h002_home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "h002_nixpkgs"; }; - gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; gpdPocket3_home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "gpdPocket3_nixpkgs"; }; diff --git a/modules/de/gnome_wayland.nix b/modules/de/gnome_wayland.nix index c20d354..d012be7 100644 --- a/modules/de/gnome_wayland.nix +++ b/modules/de/gnome_wayland.nix @@ -28,7 +28,7 @@ in }; services.gnome.core-utilities.enable = false; environment.systemPackages = with pkgs; [ - gnome.dconf-editor + dconf-editor # wayland clipboard in terminal wl-clipboard ]; diff --git a/modules/de/gnome_xorg.nix b/modules/de/gnome_xorg.nix index 6162c3a..b6e64e9 100644 --- a/modules/de/gnome_xorg.nix +++ b/modules/de/gnome_xorg.nix @@ -28,7 +28,7 @@ in }; services.gnome.core-utilities.enable = false; environment.systemPackages = with pkgs; [ - gnome.dconf-editor + dconf-editor xclip ]; }; diff --git a/users/josh/home_manager/de/gnome.nix b/users/josh/home_manager/de/gnome.nix index 0d0907b..35c5f20 100644 --- a/users/josh/home_manager/de/gnome.nix +++ b/users/josh/home_manager/de/gnome.nix @@ -12,7 +12,7 @@ with lib.hm.gvariant; # > `dconf dump / > /tmp/dconf_dump_start && watch -n0.5 "dconf dump / > /tmp/dconf_dump_current && diff --color /tmp/dconf_dump_start /tmp/dconf_dump_current -U12"` # OR (Must be logged into user directly, no SU to user will work): `dconf watch /` # OR get the exact converted nixConfig from `dconf dump / | dconf2nix | less` and search with forward slash - # gnome.dconf-editor + # dconf-editor # gnomeExtensions.workspace-switch-wraparound #gnomeExtensions.forge # probably don"t need on this on tiny laptop but may explore this instead of sway for my desktop ];