flake: update

home_packages: add fpga, cad related and other utils
all: pkgs.chromium -> pkgs.ungoogled-chromium
2024-10-07 16:07:09 +02:00 · 2024-10-07 16:05:28 +02:00 · 2024-09-14 16:29:56 +02:00 · 2024-09-09 00:35:59 +02:00 · 2024-09-03 11:48:53 +02:00
4 changed files with 39 additions and 140 deletions
--- a/flake.lock
+++ b/flake.lock
@ -33,22 +33,6 @@
      }
    },
    "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,
@ -64,7 +48,7 @@
        "type": "github"
      }
    },
-    "flake-compat_4": {
+    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@ -80,39 +64,6 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1692742795,
-        "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@ -131,30 +82,6 @@
        "type": "github"
      }
    },
-    "goatcounter": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1705880453,
-        "narHash": "sha256-Y1O6tia2Pc1MA5ZoFH3B2y7FwjZuIDiNT4C9+bBawrY=",
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "rev": "f912ab7024cbc47d5fa80a416b643707a9b50b06",
-        "type": "github"
-      },
-      "original": {
-        "owner": "asmir-abdulahovic",
-        "repo": "goatcounter-flake",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -162,11 +89,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "lastModified": 1727246346,
+        "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
        "type": "github"
      },
      "original": {
@ -177,7 +104,7 @@
    },
    "nix-xilinx": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -198,11 +125,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1726937504,
+        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
        "type": "github"
      },
      "original": {
@ -227,31 +154,13 @@
        "type": "indirect"
      }
    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1721524707,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "lastModified": 1725762081,
+        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
        "type": "github"
      },
      "original": {
@ -268,11 +177,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718784775,
-        "narHash": "sha256-tKanhhqgHdMBWS8KZ+ZYsefrQ8ipVn8NbXlSciaNc+c=",
+        "lastModified": 1727275335,
+        "narHash": "sha256-LNzRI4RhK26Ql3k2leNOemD3rTJcaw7tftoANe9BDY8=",
        "ref": "refs/heads/master",
-        "rev": "e3c064d3a995fe81731c8df7664d48b1106a707b",
-        "revCount": 33,
+        "rev": "9f36693f90e4dcbb9a18728d7a7c0d864903d4ea",
+        "revCount": 35,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@ -283,7 +192,7 @@
    },
    "peerix": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
@ -327,7 +236,6 @@
    },
    "root": {
      "inputs": {
-        "goatcounter": "goatcounter",
        "home-manager": "home-manager",
        "nix-xilinx": "nix-xilinx",
        "nixpkgs": "nixpkgs",
@ -343,7 +251,7 @@
    "simple-nixos-mailserver": {
      "inputs": {
        "blobs": "blobs",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
        "nixpkgs": [
          "nixpkgs"
        ],
@ -371,11 +279,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1723501126,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "lastModified": 1726524647,
+        "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
        "type": "github"
      },
      "original": {
@ -451,27 +359,6 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "goatcounter",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1702461037,
-        "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "d06b70e5163a903f19009c3f97770014787a080f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "zremap": {
      "inputs": {
        "nixpkgs": [
--- a/home/home.nix
+++ b/home/home.nix
@ -35,6 +35,7 @@ in {
    EDITOR = "nvim";
    _JAVA_AWT_WM_NONREPARENTING = "1";
    MOZ_ENABLE_WAYLAND = "1";
+    NIXOS_OZONE_WL = "1";
    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
    SUDO_EDITOR = "nvim";
    WLR_RENDERER = "vulkan";
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@ -6,13 +6,13 @@
  ...
 }: let
  chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
  '';
  chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
  '';
  chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
-    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+    ${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
  '';
  ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
    if ${pkgs.coreutils}/bin/test $# -ne 1; then
@ -51,13 +51,15 @@ in {
      cached-nix-shell
      caddy
      cargo
-      chromium
+      ungoogled-chromium
      cmake
      compsize
      /*cura*/
      deluge
+      dfu-util
      discord
      dmenu-wayland
+      drawio
      dualsensectl
      ffmpeg-full
      firefox
@ -70,7 +72,9 @@ in {
      gnumake
      go
      grim
+      heimdall
      hyperfine
+      icestorm
      imagemagick
      imv
      inkscape
@ -82,30 +86,35 @@ in {
      libnotify
      libreoffice
      libva-utils
+      linuxPackages_latest.perf
      lsix
      lsix
      mediainfo
      ncdu
      neovide
+      nextpnr
      ngspice
      nix-init
      nixpkgs-fmt
      nix-prefetch-git
      nodePackages.peerflix
      nom
+      openems
      openocd
      openscad
      pandoc
+      paraview
      pass-wayland
      patchelf
      pavucontrol
-      pwvucontrol
      pirate-get
      poppler_utils
      powertop
      pulsemixer
+      pwvucontrol
      python3
      python3Packages.west
+      qcad
      remmina
      river
      rtorrent
@ -133,6 +142,7 @@ in {
      wofi
      x2goclient
      yewtube
+      yosys
      yt-dlp
      zapzap
      zathura
--- a/home/sway.nix
+++ b/home/sway.nix
@ -22,6 +22,7 @@ in {
  wayland.windowManager.sway = {
    enable = true;
    extraSessionCommands = "";
+    extraConfigEarly = '' '';

    config = {
      fonts = {
@ -120,8 +121,8 @@ in {
        "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
        "Alt+Escape" = "workspace back_and_forth";
        "Alt+f" = "fullscreen enable";
-	"Alt+bracketright" = "focus output right";
-	"Alt+bracketleft" = "focus output left";
+        "Alt+bracketright" = "focus output right";
+        "Alt+bracketleft" = "focus output left";

        "Mod4+l" = ''
          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
Author	SHA1	Message	Date
Asmir A	15e60767b6	flake: update	2024-10-07 16:07:09 +02:00
Asmir A	d9d0ccaed5	home_packages: add fpga, cad related and other utils	2024-10-07 16:05:28 +02:00
Asmir A	2818f61e28	all: pkgs.chromium -> pkgs.ungoogled-chromium	2024-09-14 16:29:56 +02:00
Asmir A	b1d4994f92	home/sway: format	2024-09-09 00:35:59 +02:00
Asmir A	4b6e99130b	home/env: set NIXOS_OZONE_WL to 1	2024-09-03 11:48:53 +02:00