nixy: temp disable nixos-init

home/packages: update pkg names, temp disable jellyfin-media-player
packages: remove nix-xilinx, update package names
2025-12-01 17:28:26 +01:00 · 2025-12-01 17:27:23 +01:00 · 2025-12-01 17:26:32 +01:00 · 2025-12-01 17:24:56 +01:00 · 2025-12-01 17:24:06 +01:00 · 2025-12-01 17:19:35 +01:00
7 changed files with 103 additions and 146 deletions
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -1,8 +1,6 @@
-{
-  pkgs,
-  nix-xilinx,
-  system,
-  ...
+{ pkgs
+, system
+, ...
 }:
 {
  environment.systemPackages =
@@ -20,7 +18,7 @@
      bluez-tools
      btop
      busybox
-      curlHTTP3
+      curl
      dfu-util
      dhcpcd
      direnv
@@ -98,12 +96,5 @@
      xfsprogs
      zip
      z-lua
-    ]
-    ++ (with nix-xilinx.packages.${system}; [
-      vivado
-      vitis
-      vitis_hls
-      model_composer
-      xilinx-shell
-    ]);
+    ];
 }
--- a/flake.lock
+++ b/flake.lock
@@ -35,11 +35,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
        "type": "github"
      },
      "original": {
@@ -61,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "lastModified": 1763988335,
+        "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
        "type": "github"
      },
      "original": {
@@ -103,16 +103,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1755928099,
-        "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
+        "lastModified": 1764536451,
+        "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4a44fb9f7555da362af9d499817084f4288a957f",
+        "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -140,32 +140,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1755922037,
-        "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
+        "lastModified": 1764522689,
+        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
+        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-25_05": {
-      "locked": {
-        "lastModified": 1753749649,
-        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -177,11 +161,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756466297,
-        "narHash": "sha256-3K54DWzsAvphmLuRDAU+QjR9vAd8XDXVSCIN0olTfBM=",
+        "lastModified": 1764594740,
+        "narHash": "sha256-YLyM7w1j7BcOK9F+L7x7iY9wfOzPfcIBWW9LeU9Wzoo=",
        "ref": "refs/heads/master",
-        "rev": "a595413b88bdf05c2f35d2bba467519a6a03dd9e",
-        "revCount": 46,
+        "rev": "878c87430f5e3c109f183a1822988b1c32413131",
+        "revCount": 51,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/nvim_flake"
      },
@@ -232,15 +216,14 @@
        "git-hooks": "git-hooks",
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-25_05": "nixpkgs-25_05"
+        ]
      },
      "locked": {
-        "lastModified": 1756130152,
-        "narHash": "sha256-3qcN28djoBqqhEqOv8ve3/+wD0lLR2YCVV1EZ4SYfjo=",
+        "lastModified": 1764381008,
+        "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "b49ae46f226430854102c207fdcb55e2de8e884e",
+        "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55",
        "type": "gitlab"
      },
      "original": {
@@ -256,11 +239,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754988908,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "lastModified": 1764483358,
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
        "type": "github"
      },
      "original": {
@@ -328,11 +311,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737802495,
-        "narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=",
+        "lastModified": 1764579633,
+        "narHash": "sha256-gOD5RMHOB9Fw4T3nk2a95YdU0J24QU3uWUiZVIQza64=",
        "ref": "refs/heads/master",
-        "rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c",
-        "revCount": 23,
+        "rev": "b0707744e2b4a077e759145cdbfa8d8d1017e732",
+        "revCount": 25,
        "type": "git",
        "url": "https://git.project-cloud.net/asmir/zremap"
      },
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
  description = "NixOS configuration";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";

    nix-xilinx = {
      url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -30,7 +30,7 @@
    };

    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@@ -46,23 +46,22 @@
  };

  outputs =
-    inputs@{
-      home-manager,
-      nixpkgs,
-      nix-xilinx,
-      nvim,
-      project-cloud,
-      simple-nixos-mailserver,
-      sops-nix,
-      swaysw,
-      zremap,
-      ...
+    inputs@{ home-manager
+    , nixpkgs
+    , nix-xilinx
+    , nvim
+    , project-cloud
+    , simple-nixos-mailserver
+    , sops-nix
+    , swaysw
+    , zremap
+    , ...
    }:
    let
      pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
    in
    {
-      nixosConfigurations = rec {
+      nixosConfigurations = {
        nixy = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
          modules = [
--- a/home/common/zsh.nix
+++ b/home/common/zsh.nix
@@ -1,5 +1,10 @@
 { pkgs, lib, ... }:
 {
+  home.sessionVariables = {
+    /*ZDOTDIR = "\"$HOME/\".config/zsh";*/
+    /*HISTFILE = "\"$XDG_STATE_HOME\"/zsh/history";*/
+  };
+
  programs.z-lua = {
    enableAliases = true;
    enableZshIntegration = true;
@@ -9,6 +14,16 @@
    autocd = true;
    enableCompletion = false;
    defaultKeymap = "viins";
+    /* dotDir = "\"$XDG_CONFIG_HOME\"/zsh"; */
+
+    setOptions = [
+      "c_bases"
+      "completealiases"
+      "completeinword"
+      "nobeep"
+      "nopromptcr"
+      "notify"
+    ];

    shellAliases = {
      cfind = "${pkgs.cscope}/bin/cscope -C -R -L1";
@@ -43,8 +58,8 @@
        src = pkgs.fetchFromGitHub {
          owner = "sindresorhus";
          repo = "pure";
-          rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8";
-          hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A=";
+          rev = "54bd501c802283dee0940457da6eb3e642bd1453";
+          hash = "sha256-AZSxP2g6BWoxyiSQH7yzbbbfGcwD8jgnXPPfcYwJUL0=";
        };
        file = "pure.plugin.zsh";
      }
@@ -55,18 +70,13 @@
      }
      {
        name = "zsh-sudo";
-        src = pkgs.fetchFromGitHub {
-          owner = "hcgraf";
-          repo = "zsh-sudo";
-          rev = "d8084def6bb1bde2482e7aa636743f40c69d9b32";
-          sha256 = "1dpm51w3wjxil8sxqw4qxim5kmf6afmkwz1yfhldpdlqm7rfwpi3";
-        };
-        file = "sudo.plugin.zsh";
+        src = pkgs.oh-my-zsh;
+        file = "share/oh-my-zsh/plugins/sudo/sudo.plugin.zsh";
      }
      {
        name = "zsh-fast-syntax-highlighting";
        src = pkgs.zsh-fast-syntax-highlighting;
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
+        file = "share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh";
      }
    ];

@@ -76,18 +86,8 @@
      # binds
      bindkey '^K' fzf-file-widget

-      # options
-      setopt nobeep
-      setopt nopromptcr
-      setopt c_bases
-      setopt completeinword
-      setopt completealiases
-      setopt notify
-
-      #
      RPS1=""

-      #
      function chpwd() {
        ls;
      }
--- a/home/nixy/home.nix
+++ b/home/nixy/home.nix
@@ -64,7 +64,6 @@ in

    librewolf = {
      enable = true;
-      package = pkgs.librewolf-wayland;
      settings = {
        "webgl.disable" = true;
        "middlemouse.paste" = false;
@@ -208,9 +207,11 @@ in

    git = {
      enable = true;
-      userName = "Asmir A";
-      userEmail = "asmir.abdulahovic@gmail.com";
-      extraConfig = {
+      settings = {
+	user = {
+	  name = "Asmir A";
+	  email = "asmir.abdulahovic@gmail.com";
+        };
        init.defaultBranch = "master";
        pull = {
          rebase = true;
--- a/home/nixy/home_packages.nix
+++ b/home/nixy/home_packages.nix
@@ -67,7 +67,7 @@ in
      compsize
      kdePackages.ark
      ungoogled-chromium
-      # cura
+      cura-appimage
      deluge
      dfu-util
      discord
@@ -91,7 +91,7 @@ in
      imagemagick
      imv
      inkscape
-      jellyfin-media-player
+      #jellyfin-media-player
      kdePackages.kdenlive
      kicad
      kodi-wayland
@@ -99,7 +99,7 @@ in
      libnotify
      libreoffice-qt6-fresh
      libva-utils
-      linuxPackages_latest.perf
+      perf
      lsix
      lsix
      mediainfo
@@ -115,13 +115,13 @@ in
      openocd
      openscad
      pandoc
-      paraview
+      #paraview
      pass-wayland
      patchelf
      pavucontrol
      pay-respects
      pirate-get
-      poppler_utils
+      poppler-utils
      powertop
      pulsemixer
      pwvucontrol
@@ -130,7 +130,7 @@ in
      qucs-s
      radeontop
      remmina
-      river
+      river-classic
      rizin
      rtorrent
      sbcl
@@ -153,7 +153,7 @@ in
      waybar
      wdisplays
      weechat
-      whatsapp-for-linux
+      wasistlos
      wine
      wireshark
      wl-clipboard
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,5 +1,4 @@
 { config
-, nix-xilinx
 , nvim
 , pkgs
 , system
@@ -7,16 +6,16 @@
 , ...
 }:
 let
-  USER = "akill";
+    USER = "akill";
 in
 {
  imports = [ ];

-  system.stateVersion = "23.05";
-  system.autoUpgrade.enable = false;
-  system.switch = {
-    enable = true;
-    enableNg = true;
+  system = {
+    stateVersion = "23.05";
+    autoUpgrade.enable = false;
+    #etc.overlay.enable = true;
+    #nixos-init.enable = true;
  };

  sops = {
@@ -101,7 +100,7 @@ in
      enable = true;
      memtest86.enable = true;
    };
-    readOnlyNixStore = true;
+    nixStoreMountOpts = [ "ro" ];
    supportedFilesystems = [
      "xfs"
    ];
@@ -205,7 +204,6 @@ in

  nixpkgs.config.allowUnfree = true;
  nixpkgs.overlays = [
-    nix-xilinx.overlay
    nvim.overlays.${system}.overlay
  ];
  environment = {
@@ -256,8 +254,8 @@ in

  # List services that you want to enable:
  systemd = {
+    #sysusers.enable = true;
    services = {
-
      # Fix issue where systemd-vconsole-setup failes to find keymap
      systemd-vconsole-setup = {
        unitConfig = {
@@ -294,9 +292,9 @@ in
        description = "wg network interface";
        bindsTo = [ "netns@wg.service" ];
        requires = [ "network-online.target" ];
-        wants = [ "dnscrypt-proxy2_proton.service" ];
+        wants = [ "dnscrypt-proxy_proton.service" ];
        after = [ "netns@wg.service" ];
-        before = [ "dnscrypt-proxy2_proton.service" ];
+        before = [ "dnscrypt-proxy_proton.service" ];
        serviceConfig = {
          Type = "oneshot";
          RemainAfterExit = true;
@@ -326,7 +324,7 @@ in
        };
      };

-      "dnscrypt-proxy2_proton" = {
+      "dnscrypt-proxy_proton" = {
        description = "DNSCrypt-proxy client proton";
        wants = [
          "network-online.target"
@@ -339,7 +337,7 @@ in
          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
          CacheDirectory = "dnscrypt-proxy";
          DynamicUser = true;
-          ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy2.configFile}";
+          ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy.configFile}";
          LockPersonality = true;
          LogsDirectory = "dnscrypt-proxy";
          MemoryDenyWriteExecute = true;
@@ -379,10 +377,10 @@ in
    };

    coredump.enable = false;
-    extraConfig = ''
-      DefaultTimeoutStartSec=30s
-      DefaultTimeoutStopSec=30s
-    '';
+    settings.Manager = {
+      DefaultTimeoutStartSec = "30s";
+      DefaultTimeoutStopSec = "30s";
+    };
  };

  services = {
@@ -395,6 +393,7 @@ in
    ntp.enable = true;
    openssh.enable = true;
    printing.enable = true;
+    userborn.enable = true;

    pipewire = {
      enable = true;
@@ -497,7 +496,7 @@ in
      ];
    };

-    dnscrypt-proxy2 = {
+    dnscrypt-proxy = {
      enable = true;
      settings = {
        ipv6_servers = true;
@@ -556,26 +555,10 @@ in
      SystemMaxUse=50M
    '';

-    logind.extraConfig = ''
-      KillUserProcesses=yes
-    '';
-
-    seafile = {
-      enable = false;
-      initialAdminPassword = "admin";
-      adminEmail = "asmir.abdulahovic@gmail.com";
-      ccnetSettings = {
-        General = {
-          SERVICE_URL = "http://127.0.0.1:8020";
-        };
-      };
-      seafileSettings = {
-        fileserver = {
-          host = "0.0.0.0";
-          port = 8082;
-        };
-      };
+    logind.settings.Login = {
+      KillUserProcesses = true;
    };
+
  };

  fonts = {
@@ -602,13 +585,12 @@ in
      noto-fonts
      noto-fonts-cjk-sans
      noto-fonts-color-emoji
-      noto-fonts-emoji
      proggyfonts
      siji
      terminus_font
      terminus_font_ttf
-      ubuntu_font_family
-      vistafonts
+      ubuntu-classic
+      vista-fonts
    ];
  };

@@ -640,6 +622,7 @@ in
      enable = true;
      settings = {
        General = {
+          Experimental = true;
          Enable = "Source,Sink,Media,Socket";
        };
      };
Author	SHA1	Message	Date
Asmir A	94ed73d865	nixy: temp disable nixos-init	2025-12-01 17:28:26 +01:00
Asmir A	5a8b310ac7	home/packages: update pkg names, temp disable jellyfin-media-player	2025-12-01 17:27:23 +01:00
Asmir A	5604d83743	packages: remove nix-xilinx, update package names	2025-12-01 17:26:32 +01:00
Asmir A	e27772c045	nixy/home: update git syntax, update pkg names	2025-12-01 17:24:56 +01:00
Asmir A	59d66d327d	nixos: 25.05 -> 25.11	2025-12-01 17:24:06 +01:00
Asmir A	b829904e5d	home/zsh: change source to pkgs.oh-my-zsh	2025-12-01 17:19:35 +01:00
Asmir A	2e89da4e3b	home/zsh: update pure prompt	2025-12-01 16:47:04 +01:00
Asmir A	86642401b0	home/zsh: fix fast-syntax-higlighting path	2025-12-01 16:22:11 +01:00
Asmir A	9b91a96a73	home/zsh: use new options for zshopt	2025-12-01 16:05:58 +01:00
Asmir A	63597639c9	nixy: update syntax for 25.11, add userborn service	2025-12-01 14:13:13 +01:00