diff --git a/.gitmodules b/.gitmodules index 9c730d8..dab44df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "customPackages/chrome-pak-customizer"] path = customPackages/chrome-pak-customizer url = git@github.com:sadan4/chrome-pak-customizer -[submodule "customPackages/ceserver"] - path = customPackages/ceserver - url = git@github.com:sadan4/ceserver.git diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index defb8bf..cd19725 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -5,6 +5,7 @@ config, pkgs, inputs, + stable, ... }: { @@ -27,6 +28,7 @@ ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; + nix.package = stable.nix; hardware.i2c.enable = true; hardware.amdgpu.opencl.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; diff --git a/common/users/homeModules/dev/cpp.nix b/common/users/homeModules/dev/cpp.nix index 8841d05..618b17d 100644 --- a/common/users/homeModules/dev/cpp.nix +++ b/common/users/homeModules/dev/cpp.nix @@ -10,7 +10,7 @@ glib bear glibc - gdb + pinned.gdb lldb_19 cpkg.ceserver unstable.llvmPackages_19.clang-tools diff --git a/common/users/homeModules/flameshot.nix b/common/users/homeModules/flameshot.nix index 1d26929..30a1114 100644 --- a/common/users/homeModules/flameshot.nix +++ b/common/users/homeModules/flameshot.nix @@ -1,4 +1,5 @@ { config, ... }: { + systemd.user.services.flameshot.Unit.After = []; services = { flameshot = { enable = true; @@ -7,7 +8,6 @@ savePath = "/home/${config.home.username}/ss/"; saveAsFileExtension = ".png"; showDesktopNotification = false; - startupLaunch = true; }; }; }; diff --git a/common/users/homeModules/pinned.nix b/common/users/homeModules/pinned.nix index dbacc67..b91c52f 100644 --- a/common/users/homeModules/pinned.nix +++ b/common/users/homeModules/pinned.nix @@ -4,7 +4,8 @@ overlays = [ # self: super: # pkgs: _: - (pkgs: _: + ( + pkgs: _: let defaultOpts = { system = pkgs.system; @@ -17,41 +18,51 @@ # extend packages here pinned = { # 1.89.1 - vscode = (import - (builtins.fetchGit { + vscode = + (import (builtins.fetchGit { # Descriptive name to make the store path easier to identify name = "pinned-vscode"; url = "https://github.com/NixOS/nixpkgs/"; ref = "refs/heads/nixpkgs-unstable"; rev = "0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb"; - }) - defaultOpts).vscode; + }) defaultOpts).vscode; # removed for having out of date electron - etcher = (import - (builtins.fetchGit { - # Descriptive name to make the store path easier to identify - name = "pinned-etcher"; - url = "https://github.com/NixOS/nixpkgs/"; - ref = "refs/heads/nixpkgs-unstable"; - rev = "336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; - }) - { - system = pkgs.system; - config = { - permittedInsecurePackages = [ "electron-19.1.9" ]; - }; - }).etcher; + etcher = + (import + (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "pinned-etcher"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "336eda0d07dc5e2be1f923990ad9fdb6bc8e28e3"; + }) + { + system = pkgs.system; + config = { + permittedInsecurePackages = [ "electron-19.1.9" ]; + }; + } + ).etcher; # support non-updated plugins - idea-ultimate = (import - (builtins.fetchGit { + idea-ultimate = + (import (builtins.fetchGit { name = "pinned-idea-ultimate"; url = "https://github.com/NixOS/nixpkgs/"; ref = "refs/heads/nixpkgs-unstable"; rev = "05bbf675397d5366259409139039af8077d695ce"; - }) - defaultOpts).jetbrains.idea-ultimate; + }) defaultOpts).jetbrains.idea-ultimate; + gdb = + (import (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "my-old-revision"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "05bbf675397d5366259409139039af8077d695ce"; + }) defaultOpts).gdb; + }; - }) + } + ) ]; }; } diff --git a/customPackages/ceserver b/customPackages/ceserver deleted file mode 160000 index 8d4e3d9..0000000 --- a/customPackages/ceserver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8d4e3d9135e3f5505e14a73bd2084508425902d4 diff --git a/customPackages/default.nix b/customPackages/default.nix index 9b39af9..f18b312 100644 --- a/customPackages/default.nix +++ b/customPackages/default.nix @@ -9,7 +9,7 @@ # vencord = pkgs.callPackage ./vencord/package.nix { }; frog = pkgs.callPackage ./frog { }; chrome-pak-customizer = pkgs.callPackage inputs.chrome-pak { }; - ceserver = pkgs.callPackage inputs.ceserver { }; + ceserver = inputs.ceserver.flakePackage pkgs; scripts = inputs.scripts.flakePackage pkgs; }; }) diff --git a/dotfiles/scripts b/dotfiles/scripts index 64ada88..2e9ffe0 160000 --- a/dotfiles/scripts +++ b/dotfiles/scripts @@ -1 +1 @@ -Subproject commit 64ada88f6a98ca4d0d1f8b0731d6eb05c5458a99 +Subproject commit 2e9ffe0933a170332bc490771a01dbbd75d06d71 diff --git a/flake.lock b/flake.lock index ba2f6a7..ab7221e 100644 --- a/flake.lock +++ b/flake.lock @@ -181,19 +181,25 @@ } }, "ceserver": { - "flake": false, + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, "locked": { - "lastModified": 1734914170, - "narHash": "sha256-B7skTPWTsKVU/0rySrIirXPzviBunjnwOUMGfc2sQ6Y=", - "ref": "refs/heads/main", - "rev": "8d4e3d9135e3f5505e14a73bd2084508425902d4", - "revCount": 3, - "type": "git", - "url": "file:./customPackages/ceserver" + "lastModified": 1736890977, + "narHash": "sha256-40lqruAtMWVbuslqmm7tSja2mDDL1QnTjfsVTWk3C/0=", + "owner": "sadan4", + "repo": "ceserver", + "rev": "e3c2b7c3b5cb9eb5bb322632c55b6fea44b0b2ec", + "type": "github" }, "original": { - "type": "git", - "url": "file:./customPackages/ceserver" + "owner": "sadan4", + "repo": "ceserver", + "type": "github" } }, "chrome-pak": { @@ -212,6 +218,22 @@ "url": "file:./customPackages/chrome-pak-customizer" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1733328505, @@ -280,11 +302,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -295,7 +317,10 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "ceserver", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -382,6 +407,59 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "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" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -423,11 +501,11 @@ ] }, "locked": { - "lastModified": 1734893686, - "narHash": "sha256-JUEZn9MmpLGsW4J3luSX+R4BhcThccYpYg5AuKW7zG0=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "edb8b00e4d17b2116b60eca50f38ac68f12b9ab4", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -465,11 +543,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -502,7 +580,7 @@ "nix-alien": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs" @@ -563,11 +641,11 @@ ] }, "locked": { - "lastModified": 1734838217, - "narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=", + "lastModified": 1736652904, + "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78", + "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", "type": "github" }, "original": { @@ -578,11 +656,11 @@ }, "nix-stable": { "locked": { - "lastModified": 1734529975, - "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -595,17 +673,16 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", "nixpkgs": [ "nix-stable" ] }, "locked": { - "lastModified": 1733854371, - "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -632,23 +709,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { @@ -731,11 +808,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1736808430, + "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", "type": "github" }, "original": { @@ -750,8 +827,10 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ @@ -760,14 +839,15 @@ "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1734885904, - "narHash": "sha256-NxA4JnLuXyle2/nUKDbW8vORwSd+Z20limIl7DhlZbs=", + "lastModified": 1736882096, + "narHash": "sha256-TQFkQ6RN8L/Xto5Ttt6hwJInFI5Nz2uCfXg5ci2q6UA=", "owner": "danth", "repo": "stylix", - "rev": "4d87b96ceca38532f39c1b7efd8a9235bfcee3d6", + "rev": "965d1cb7c84170200b4f05e68ebd27a88d171e8c", "type": "github" }, "original": { @@ -901,6 +981,22 @@ "repo": "tinted-tmux", "type": "github" } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f9dc54c..04ef9da 100644 --- a/flake.nix +++ b/flake.nix @@ -38,8 +38,8 @@ flake = false; }; ceserver = { - url = "git+file:./customPackages/ceserver"; - flake = false; + url = "github:sadan4/ceserver"; + inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts.url = "github:hercules-ci/flake-parts"; nix-alien.url = "https://flakehub.com/f/thiagokokada/nix-alien/0.1.384.tar.gz";