diff --git a/common/components/packages-full.nix b/common/components/packages-full.nix index c0670c0..e2c05e7 100644 --- a/common/components/packages-full.nix +++ b/common/components/packages-full.nix @@ -20,7 +20,7 @@ yq neofetch tldr - dust + # dust powertop fzf atuin diff --git a/common/hardware/btrfs.nix b/common/hardware/btrfs.nix index 1b40b20..d37e0c9 100644 --- a/common/hardware/btrfs.nix +++ b/common/hardware/btrfs.nix @@ -7,7 +7,7 @@ # Btrfs CRC hardware acceleration "crc32c-intel" ]; - + services.btrfs.autoScrub = { enable = true; interval = "monthly"; diff --git a/common/programs/zsh.nix b/common/programs/zsh.nix index 4d4bc67..9a33b47 100644 --- a/common/programs/zsh.nix +++ b/common/programs/zsh.nix @@ -13,6 +13,6 @@ theme = "robbyrussell"; }; }; - + users.defaultUserShell = pkgs.zsh; } diff --git a/common/services/auditd.nix b/common/services/auditd.nix index 1255cce..57073b4 100644 --- a/common/services/auditd.nix +++ b/common/services/auditd.nix @@ -9,7 +9,7 @@ # "-w /home/tasia -p wa -k home_changes" ]; }; - + auditd.enable = true; }; diff --git a/common/services/usbguard.nix b/common/services/usbguard.nix index 10e6d99..f329fa2 100644 --- a/common/services/usbguard.nix +++ b/common/services/usbguard.nix @@ -24,6 +24,9 @@ allow id 046d:c08b serial "178D316C3832" name "G502 HERO Gaming Mouse" allow id 18d1:4ee1 serial "28051FDH200ATC" name "Pixel 7" allow id 2717:ff40 serial "52bb384f0512" name "Redmi 10 2022" + + allow id 04f9:02d3 serial "E71830G6J592482" name "" # Printer + allow id abcd:1234 # small usb ''; }; } diff --git a/flake.lock b/flake.lock index 9cb46b9..f4b375f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,71 +1,5 @@ { "nodes": { - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -73,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -86,84 +20,13 @@ "type": "github" } }, - "nix-software-center": { - "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", - "owner": "snowfallorg", - "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "nix-software-center", - "type": "github" - } - }, - "nixos-conf-editor": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", - "snowfall-lib": "snowfall-lib" - }, - "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", - "owner": "snowfallorg", - "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "nixos-conf-editor", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1692638711, - "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -176,43 +39,18 @@ "root": { "inputs": { "home-manager": "home-manager", - "nix-software-center": "nix-software-center", - "nixos-conf-editor": "nixos-conf-editor", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "stable": "stable", "unstable": "unstable" } }, - "snowfall-lib": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils-plus": "flake-utils-plus", - "nixpkgs": [ - "nixos-conf-editor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, "stable": { "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", + "lastModified": 1714685007, + "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", + "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", "type": "github" }, "original": { @@ -222,43 +60,13 @@ "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" - } - }, "unstable": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -267,24 +75,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f4802aa..a83cde2 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; - nix-software-center.url = "github:snowfallorg/nix-software-center"; + # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; + # nix-software-center.url = "github:snowfallorg/nix-software-center"; }; outputs = { @@ -22,8 +22,8 @@ stable, unstable, home-manager, - nixos-conf-editor, - nix-software-center, + # nixos-conf-editor, + # nix-software-center, ... } @ inputs: let inherit (self) outputs; diff --git a/home/tasia/home.nix b/home/tasia/home.nix index c7e4b66..727af15 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -30,7 +30,7 @@ l = "ls"; lg = "lazygit"; ll = "ls -al"; - + done = "curl -d 'Done' ntfy.sh/tasiaiso_done"; rebuild = "sudo nixos-rebuild switch --flake .#$(cat /etc/hostname)"; }; @@ -68,6 +68,9 @@ stress lazygit + ssb-patchwork + xonotic + # android-tools # endless-sky # gnucash diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index e6e3610..a4d3966 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -81,7 +81,6 @@ in { tildefriends osu-lazer-bin - # inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor # inputs.nix-software-center.packages.${system}.nix-software-center ];